Cleaned up reporting functions