Clean and tidy (25/43)

Clean and tidy