- Bit of refactoring.