minor refactoring to variables names