little refactoring
refactoring on statistics, mostly added some comments
removed All