code cleaning/fixed variable