Few changes to comments