Refactoring inputs #1