DRYE'ed up behaviors a little more