Made changes to fix duplication
Merge pull request #2 from RyanDawkins/refactor_controllers

Made changes to fix duplication