Some more changes improving code style conformance and code size.
Merge pull request #165 from oliverschmidt/master

Some more changes improving code style conformance and code size.