Make input variables more clear