Added the value beside each point in the statistic

Also refactored a tiny bit.