Review requests:

- Removed unnecessary float casting
- Removed unused null return value
- Removed unnecessary null object check