Making some suggested code-review changes
Making some suggested code-review changes

Signed-off-by: Cemah Tudae-Torboh <ecd17c149fa33486fb4952f679100d5b0b42a51d@comcast.com>

concourse/concourse,concourse/concourse,concourse/concourse,concourse/concourse,concourse/concourse