refactor class tasks