Trivial code style fixes
Removed trace output
Style fixes
Merge pull request #479 from hintjens/master

Tiny fixups