PIM-1891 : small cosmetic changes