Attempt to reduce flog in home controller
Tidy up formatting a bit