Having a tidy up

completed