Code base refactoring.