cleans up some var declarations
Organizing the constants
snake case to camel case