some further little optimization