Tidy up controllers code formatting