Tidy up cli a bit