Couple little changes to output format