FLUID-5251: Addressed antranigs comments with function replacement and unecessary comments