RF: refactor stats