Clean up the cwa_stats code so we can start getting more features