Just some cleanup
Merge pull request #9 from kalbermattenm/cleanup

Just some cleanup