Minor wording change
Make code simpler: do not generated extended attributes
Make code smaller: move my vars onto a single line