- Minor refactor for efficiency.