refactor salestax