Various reformatting to accommodate new transformation script.