Just a bit of refactoring.