Super minor refactoring