refactor setup task
merge