Revisit to remove var