class members refactoring refactoring