refactor, 4