Cleaned up sender and receiver comments