Clean-up in int-to-float conversion