Addresses review feedback, exterimates var