Implementing stats and little code cleanup