Cleaned up hardcodes