Refactoring: remove goto