minor efficency updates