Remove warning and better variable name