Can't remember what I did
Removed a silly unnecessary goto statement