Make some changes in response to reviewer comments