Cleaner transform on new doc