MOB-238 addressing feedback from code review