Refactoring processing, temp commit