Float code cleanup