refactoring variables
refactoring variables and methods