Fixed logic in the transformer
Fixed Style