Continus with refactoring.