goto after Move refactoring