refactoring
rename vars
refactoring