Issue #3 - Statistics
cleanup