Cleanup CLI interface by writing to streams
Simplify commands and add errors