transformers

904c9630 - Apply some more suggestions of code review