Stats Tools Refactored