Tiny refactor
Inline variable
Inline variable
Refactor controller logic a little more