diff --git a/frames/log_test.go b/frames/log_test.go
index c88168a5..dec06011 100644
--- a/frames/log_test.go
+++ b/frames/log_test.go
@@ -34,12 +34,12 @@ var _ = Describe("Frame logging", func() {
 
 	It("logs sent frames", func() {
 		LogFrame(&RstStreamFrame{}, true)
-		Expect(string(buf.Bytes())).To(Equal("\t-> &frames.RstStreamFrame{StreamID:0x0, ByteOffset:0x0, ErrorCode:0x0}\n"))
+		Expect(string(buf.Bytes())).To(Equal("\t-> &frames.RstStreamFrame{StreamID:0x0, ErrorCode:0x0, ByteOffset:0x0}\n"))
 	})
 
 	It("logs received frames", func() {
 		LogFrame(&RstStreamFrame{}, false)
-		Expect(string(buf.Bytes())).To(Equal("\t<- &frames.RstStreamFrame{StreamID:0x0, ByteOffset:0x0, ErrorCode:0x0}\n"))
+		Expect(string(buf.Bytes())).To(Equal("\t<- &frames.RstStreamFrame{StreamID:0x0, ErrorCode:0x0, ByteOffset:0x0}\n"))
 	})
 
 	It("logs stream frames", func() {
diff --git a/frames/rst_stream_frame.go b/frames/rst_stream_frame.go
index 44369b19..87778754 100644
--- a/frames/rst_stream_frame.go
+++ b/frames/rst_stream_frame.go
@@ -10,8 +10,8 @@ import (
 // A RstStreamFrame in QUIC
 type RstStreamFrame struct {
 	StreamID   protocol.StreamID
-	ByteOffset protocol.ByteCount
 	ErrorCode  uint32
+	ByteOffset protocol.ByteCount
 }
 
 //Write writes a RST_STREAM frame
diff --git a/frames/stream_frame.go b/frames/stream_frame.go
index 8fd72f84..fa833f80 100644
--- a/frames/stream_frame.go
+++ b/frames/stream_frame.go
@@ -11,11 +11,11 @@ import (
 
 // A StreamFrame of QUIC
 type StreamFrame struct {
-	FinBit         bool
 	StreamID       protocol.StreamID
+	FinBit         bool
+	DataLenPresent bool
 	Offset         protocol.ByteCount
 	Data           []byte
-	DataLenPresent bool
 }
 
 var (
diff --git a/public_header.go b/public_header.go
index 288b027e..475c1b60 100644
--- a/public_header.go
+++ b/public_header.go
@@ -21,13 +21,13 @@ var (
 // The PublicHeader of a QUIC packet
 type PublicHeader struct {
 	Raw                  []byte
+	ConnectionID         protocol.ConnectionID
 	VersionFlag          bool
 	ResetFlag            bool
-	ConnectionID         protocol.ConnectionID
 	TruncateConnectionID bool
-	VersionNumber        protocol.VersionNumber
 	PacketNumberLen      protocol.PacketNumberLen
 	PacketNumber         protocol.PacketNumber
+	VersionNumber        protocol.VersionNumber
 	DiversificationNonce []byte
 }