Make controller action clearer

The before_action calls were harming the comprehensibility of the code.