Cleaned up reporting