State legislature tackles tax reform in two bills