more tasks refactored