A set of 3 refactoring commits