avoid some float conversions or make them explicit when needed

avoid some float conversions or make them explicit when needed #301