Tidy up several messages and move some output to proper format