Minor bit of refactoring/cleanup