Cleaned up stats