Added VAT and cleaned up