cleaned up cli (still needs work)