Removed unneeded floats and casts