cleanup fixes #17
Merge pull request #18 from Keeo/PP-17

cleanup fixes #17