Refactoring and correction of attributes...