Clean up
Merge pull request #51 from verschoof/cleanup

Clean up