Refactored user input