completed refactoring of attributes converted code