Repositioned attr_accessor etc to reflect feedback