Generate Report and Code Cleanup/Improvements