Refactor actual work counting