home controller tidy up