Wee bit of refactoring