Refacturing Task usage on device