LQE-73 - Refactor controllers