Pairs statistic & refactor names