Clean up some stats
rename refactor