Minor updates
Joined Integer and Float into a single Number