Added proper transform output. Also some reformatting.