Another refactoring is done.