Refactor analysed count