Better transform composition, some cleaning