Began integrating configuration and cleaning up code.