Refactor plus minor update to Floating task