Updates following code review