Controller updates
Linting cleanup