A little cleanup and switch to safer JSON (instead of .py) config file.