comments and beautification