small polish on endpoint processing