MOB-238 feedback from code review
MOB-238 addressing feedback from code review