Cleaned up setupNewGame method and calls to that method.