Updating comments and documentation