Cleaned up auto-generated comments