Refactor code.
Changed class name, use job and task to replace old one.