add maybe transformer
clean-up
clean-up names