[JENKINS-22839] Style changes after feedback

Incorporated @jglick's feedback from #1219.