Prepare to merge refactored code