Reporting: classification tidy up code | variable names