attribute refactoring
attribute refactoring