Please Review: (630098) fix coverity Defect Type: Code maintainability issues