Cleaned up cli