CON-33 #comment Made changes according to notes from code review