Draft: Resolve "clean-up contoller code"

Closes #16

Merge request reports

Loading