Address comments following code review