Before refactoring steps