Cleanup
Merge pull request #24 from gajdaw-teaching/cleanup

Cleanup