Merge pull request #204 from ping19/master

Cleanup code/ Class renaming