Cleaned up the Statistic code a little bit