Updated reports
Code cleanup