Refactoring to clean up diff.