Refactor primary stats