MOB-238 feedback from code review