[BHV-15215]Correct control is not spotted when moving out

Code refactoring based on review comments
Enyo-DCO-1.1-Signed-off-by: Rajyavardhan P rajyavardhan.p@lge.com