Refactoring, more visible stats, leverage to sort