A teeny bit of refactoring