Clean up and better constant usage