checkstyle refinement
fixed a checkstyle warning
eliminated in-line conditionals to improve readability

It was pretty hard to tell what was going on here.