cleaned up basic CLI