Beautification update