Merge "Refactoring on transform types"