Documentation changes

Updated and removed remaining comments provided in the forked file
rendition