Added comment stripping