Clean up some comments based on pull request feedback