A spot of refactoring