Common refactoring, intermediate commit