cleanup
Merge pull request #1 from poofyleek/master

cleanup