Refactor attribute methods for simplicity and readability
Merge pull request #348 from projecthydra/simplify_attributes

Refactor attribute methods for simplicity and readability