Fix wrong indent in file, extract statistic util to seperate class