Cleaned up standard event formats