Cleaning up new Input code
Lint fixes