Fix line wrap and modify variable name