Cleanup constants
Simplify guard statement