Refactor FLoatingTask