Made messages prettier - thanks Riccardo