Cleaned up report state using map