refactor - part 2