streamlined several conditionals