Beautification 6.2.1