General
Code Refactoring
Fixed an issue with floats