Removing unnecessary attr_accessor and refactoring specs