Cleaned up the constants a little bit more
Merge pull request #4 from squishybear/master

Cleaned up the constants a little bit more