Tidy up
Revert "Tidy up"

This reverts commit f7e5110a38ed82bbe541f78bfd05259eb8c2af30.
Tidy up controllers