More cleanup and fixing REEPORT commenting