Cleanup of code (warnings, typos, spaces, newlines).
Merge pull request #445 from Donnerbart/cleanup

Cleanup of code (warnings, typos, spaces, newlines).