refactored class members