Last edits from earlier code review