comments and documentation and beautification