DRY it out some