updates per Mentor

Blanche suggested more efficient code which has been added