Refactoring a teeny tiny bit