Address comments from Tom's code review