Further refactoring of inputs.
Further refactoring of inputs.