After the tidy up

Tidied