Code cleanup fest

fix config