Small bit of refactoring