Cleaned up report display and writing