PIM-1489 : Clean refactored code for children action