Cleaned up the constants a little bit more