Refactoring step. Cleaning.