Refactors controller and spec :metal: