Updated comments and documentation
Updated comments and documentation