Some cleanup
Merge pull request #2 from jackmu95/master

Some cleanup