Tidy-up
A bit of refactoring.