A little cleanup and another output style