Update controllers to the styleguide