Tidying up the mammoth home controller, could still do with some love