Clean up comments and a close()
Merging origin/goliver/master-pending-source-docs into master