Cleaned up comments in files for #2067 as requested