Refactor and fix the Input class.