Refactor tax status conditionals into separate methods