Changes to existing code for refactoring.