Made changes that were suggested in code review comments.