refactoring

・refactoring [Share Move code into helper]