Addressing nits from Gregg