Cleanup
Added statistics.