PIM-1489 : Clean code