Refactor of transformations