More tidying
First pass