[JENKINS-22839] Style changes after feedback