Changes as per code review - part 1