quick code cleanup
Merge pull request #1 from jayparadise/master

quick code cleanup