Refactor: Variable names and Validations