code style fixes, semantics are preserved
fix code style, remove dead code
more code style changes
more style changes
Merge pull request #657 from hannesm/minor

code style fixes, semantics are preserved