Minor changes to Format.cs