Refactoring, call & goto statement realized