Beautification changes