o Smallish cleanup and get rid of some gotos.