removed the "infamous" goto