Cleaned up controllers and routes