Changes to reflect best practice for controller definition.