Tidy First?

Refactoring