Refactor controller & helpers. Remove unused methods. Adhere to styleguide.