Removed Goto statement