[CLEANUP] Controller formatting