trivial refactoring: part 2