Refactor count choice