Userreports cleanup

no functional changes, just some cleanup i have been doing while trying to implement other stuff