Refactored vat calculation