Tidy up front controller