separate out the config
cleanup of unused imports and vars
put command line args in config
cleanup