Minor Refactor, loaders.py, cli.py