VID-605 Addressed a code review comment & made formatting changes