very minor touch-ups from previous commit