Beginning refactoring for attributes