Refactoring step. Minor cleaning.