refactoring of taxes