Simplified CLI and fixed a typo in arg parser