Merge pull request #1 from Jotschi/cleanup

Minor cleanup of the existing codebase