Code cleaning and adding support for input[type=number] fields

Signed-off-by: Kevin Kinnebrew <kevin.kinnebrew@gmail.com>