remove redundant instruction. Clean whitespace
wrap chained comparisons to make code easier to read
Merge pull request #2 from waldir/patch-2

Remove redundant instruction. Clean whitespace