A bunch of little format changes