Refactor/waste count to use counter