another boring refactoring