Finish off controllers
Tidy up