Providing a target to tidy things up during development
Refactoring for clarity