diff --git a/src/ImageSharp/Formats/Gif/GifConstants.cs b/src/ImageSharp/Formats/Gif/GifConstants.cs
index c945ce122..06c4b3fc6 100644
--- a/src/ImageSharp/Formats/Gif/GifConstants.cs
+++ b/src/ImageSharp/Formats/Gif/GifConstants.cs
@@ -92,6 +92,16 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// </summary>
         public static readonly Encoding Encoding = Encoding.ASCII;
 
+        /// <summary>
+        /// The collection of mimetypes that equate to a Gif.
+        /// </summary>
+        public static readonly IEnumerable<string> MimeTypes = new[] { "image/gif" };
+
+        /// <summary>
+        /// The collection of file extensions that equate to a Gif.
+        /// </summary>
+        public static readonly IEnumerable<string> FileExtensions = new[] { "gif" };
+
         /// <summary>
         /// Gets the ASCII encoded bytes used to identify the GIF file (combining <see cref="FileType"/> and <see cref="FileVersion"/>).
         /// </summary>
@@ -111,15 +121,5 @@ namespace SixLabors.ImageSharp.Formats.Gif
             (byte)'P', (byte)'E',
             (byte)'2', (byte)'.', (byte)'0'
         };
-
-        /// <summary>
-        /// The collection of mimetypes that equate to a Gif.
-        /// </summary>
-        public static readonly IEnumerable<string> MimeTypes = new[] { "image/gif" };
-
-        /// <summary>
-        /// The collection of file extensions that equate to a Gif.
-        /// </summary>
-        public static readonly IEnumerable<string> FileExtensions = new[] { "gif" };
     }
 }
diff --git a/src/ImageSharp/Formats/Png/PngConstants.cs b/src/ImageSharp/Formats/Png/PngConstants.cs
index 4ad698e32..247bb3c75 100644
--- a/src/ImageSharp/Formats/Png/PngConstants.cs
+++ b/src/ImageSharp/Formats/Png/PngConstants.cs
@@ -37,21 +37,6 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// </summary>
         public static readonly IEnumerable<string> FileExtensions = new[] { "png" };
 
-        /// <summary>
-        /// Gets the header bytes identifying a Png.
-        /// </summary>
-        public static ReadOnlySpan<byte> HeaderBytes => new byte[]
-        {
-             0x89, // Set the high bit.
-             0x50, // P
-             0x4E, // N
-             0x47, // G
-             0x0D, // Line ending CRLF
-             0x0A, // Line ending CRLF
-             0x1A, // EOF
-             0x0A // LF
-        };
-
         /// <summary>
         /// The header bytes as a big-endian coded ulong.
         /// </summary>
@@ -78,5 +63,20 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// The minimum length of a keyword in a text chunk is 1 byte.
         /// </summary>
         public const int MinTextKeywordLength = 1;
+
+        /// <summary>
+        /// Gets the header bytes identifying a Png.
+        /// </summary>
+        public static ReadOnlySpan<byte> HeaderBytes => new byte[]
+        {
+            0x89, // Set the high bit.
+            0x50, // P
+            0x4E, // N
+            0x47, // G
+            0x0D, // Line ending CRLF
+            0x0A, // Line ending CRLF
+            0x1A, // EOF
+            0x0A // LF
+        };
     }
 }