refactor class members