Tidy up: 1) use cfg_size function for stats; 2) keep variable names consistent
Tidy up: 1) use cfg_size function for stats; 2) keep variable names consistent
fix indentation