PIM-865 : Clean code