MOB-1513, address code review comments