PIM-3260 : cleanup and comments