Refactor specs.
Refactor controller.