Some code cleanup and reorder advanced stats players