clean code + added new stats