Cleaned up code
Fixed Double -> Float conversion issue
Fixed type converesion
Fixed failing tests