Beautify the code