BG + DRY cleanup