Remove hack that was just giving us compatibility with php code
Tidy up controller logic
Small refactor
Inline variable
Inline variable
Inline variable
Extract helper
Inline variables