Cleaned up code

Mainly removed most of the constants from the constants class.