Refactor code to pass `less —strict-math=on` for sure