Just some cleanup work DRY...