Controller: Changes according to code review 9/19

Reviewers --
- Austin Baylis
- Jason Nezvadovitz

Authors --
- Jake