Beautify code