mid refactoring commit