Removing and refactoring constants for ENV