Addressed a minor code review feedback