Cleaned up the constants