This rule & the next few seem like the same thing, can we DRY this at all?