Next round of updates from code review