refactoring tasks