Preparing to merge refactored code.