more whitespace fixes
Merge branch 'cleanup' into fixes
fix conditionals & space