cleanup
Merge pull request #1 from rbaier/cleanup

cleanup