Reporting: remove logging & tidy up code