Refactoring after merge.