refactoring: label renaming. Removed goto