Cleaned up cli.