Refactored taskever a bit