Cleaned up for HTML/CSV reporting