Removed gotos from output.c