Started sanitizing
More sanitizing
Fixed errors
Refactored cli.py