Update for #91: Modify as per code review for 7acb855e7806f4530f8815a0b897c33b1fbb9e6a commit