OCSADV-196: Made changes as recommended by code review.