refactor to address @CptStubing's latest comment on Issue #2