Cleaned up constants