Refactoring - intermediate commit