Refactoring done; model, controller and feature tests passing