Beautification and documentation