Clean up attributes util
Merge pull request #1 from AmoebaMan/attribute-storage

Clean up attributes util