Clean up imports
Clean up dicts in config file, more idiomatic