ne a bit of refactoring.