cleaning up main to work with the new config.py data structures