tidy up boolean ordering
Merge pull request #72 from catphish/master

tidy up boolean ordering