Cleaned up Reporter classes