Sort out user input (and pretty up output a little)