touchup refactoring