remove some copy/paste in transformations