Clean up a bit of transform
Updated to parse V15.1