Streamline the configuration process a bit.

I'm nit picky about configurations. :)