Refactor: Separate reusable steps in files
Remove unused imports