Refactored transforms