Small logic cleanup

Replaces 2 logic spots with generic functions that were already in place.