cleaned up some transforms