Consolidate controller actions/methods and make easier to extend