MOB-237 addressing feedback from code review