Refactoring - 3rd step.