Code refactoring before rebasing.