Fix transformer
Adjust to coding style