Cleaned up hard coded constants