Beautify a bit