AndReporter.t and Refactoring
Overdue checkin