Refactoring various predicates for owise.
Fix warning + some pedantic whitespace stuff.
Merge pull request #62 from chathhorn/master

Fix warnings + other minor refactoring