- refactored some reporting code