Redesigning constants object.
Removing commented out code.