Simple refactoring as I browsed the code