Updates from code review