minor optimisation
minor adjustments