Made refactoring.