OCSADV-23: Made code changes as recommended by Carlos.