Cleaning comments, includes and fixing error in report.