refactor(all): Step 1