intermediary refactoring commit.