Just cleaning up some and setting up some initial configuration options