Merge in refactoring