188aac fix incorrect logic (&& vs. &), remove unnecessary comparisons.

Authored and Committed by midipix 8 years ago
    fix incorrect logic (&& vs. &), remove unnecessary comparisons.