after refactoring. maked names shorter