Cleaning up the tax mess