Small  style/comments fixes