Refactored code #4253

Review ID: