Refactor transform2d to transform