Tidy 2

Tidied