PIM-836 : Clean code