Refactor counts