MONDRIAN-1771 - applying few small changes from code review