[Issue #7] Incorporated review feedback from @jeffharrell