Removed duplication.
Cleaned up Attribute.
Merge pull request #11 from alexfalkowski/arf/refactor

Arf/refactor