Export - Cleaned up the TransformService