Preparing for refactoring commit