Tiny bit of refactoring/cleaning.