refactor: step 1
refactor: 2/2