Few comment changes