Removed gotos from main.c

Small chunks are good.