Touch ups from code review