cleaned up a bit
Merge pull request #192 from Noahhh/master

cleaned up a bit