refactoring

rename more variables