little DRY changes