Cleaned up Constants file