refactor, 3