Some comment removal and added missing method