code cleaning, new config