Added user input validations

Changed some methods and variables names