move vat logic to the app
some cleanup