Removed redundant float functions.
Resolve some sort issues + whitespace fixes.