Small bit of "oops refactoring"