clean up and DRY out