Turned off debug
Simplified constants
clean up