Simplify use of attr_accessor

Removing some metaprogramming that can be done much more simply.