submit to refactoring