Refactored Code #4253

Review ID: 3253001