Refactored more AsyncTasks