clean up/organizing/reducing number of tasks to only 2