Clean up ENV variable usage and constants