reformat + fix config class