Improve user input