Cleaning up code, setting constants for everything