UPPERCASE all user input, refactoring