Clean up
Merge pull request #15 from rkophs/cleanUp

Clean up