Cleanup the setup code a little.
Cleanup the setup code a little.