removed unneccessary goto