Code cleanup

Cleaned up New Game code. Moved some code into regions so it's out of
the way.