Removed unnecessary reporting of  var; minor comments cleanup