Beautifier changes