MOB-1516, address code review comments