more cleanup
Merge pull request #17 from Fanneyyy/cleanUp

more cleanup