Updated variable names, if statement for input handling