Simplify some logic

@jkburges, I obviously missed this opportunity when I reviewed this