refactor transformers