Minor changes in comments/code