Code Cleanup - Stats Correctly Showing