Refactored code to make routing easier for controllers that may be added later