Some efficiencies

Next ...