stats: refactor