first refactor step (master)