Tidy up demo messages which are output over serial port