step 2. first step of refactoring was completed.