Cleanup
Merge pull request #16 from Fanneyyy/cleanUp

Cleanup