diff --git a/asserter/asserter.go b/asserter/asserter.go
index 41c5d18c..fb5d0c28 100644
--- a/asserter/asserter.go
+++ b/asserter/asserter.go
@@ -374,7 +374,7 @@ func NewGenericRosettaClient(
 		ignoreRosettaSpecValidation: true,
 	}
 
-	//init default operation statuses for generic rosetta client
+	// init default operation statuses for generic rosetta client
 	InitOperationStatus(asserter)
 
 	return asserter, nil
diff --git a/headerforwarder/forwarder.go b/headerforwarder/forwarder.go
index 1768ebe3..85cb7814 100644
--- a/headerforwarder/forwarder.go
+++ b/headerforwarder/forwarder.go
@@ -115,7 +115,6 @@ func (hf *HeaderForwarder) getResponseHeaders(rosettaRequestID string) (http.Hea
 // those headers on the response
 func (hf *HeaderForwarder) HeaderForwarderHandler(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-
 		// add a unique ID to the request context, and make a new request for it
 		requestWithID := hf.WithRequestID(r)
 
@@ -123,7 +122,7 @@ func (hf *HeaderForwarder) HeaderForwarderHandler(next http.Handler) http.Handle
 		// NOTE: ResponseWriter::WriteHeader() WILL be called here, so we can't set headers after this happens
 		// We include a wrapper around the response writer that allows us to set headers just before
 		// WriteHeader is called
-		wrappedResponseWriter := NewHeaderForwarderResponseWriter(
+		wrappedResponseWriter := NewResponseWriter(
 			w,
 			RosettaIDFromRequest(requestWithID),
 			hf.getResponseHeaders,
diff --git a/headerforwarder/response_writer.go b/headerforwarder/response_writer.go
index 3a2a759c..c8ce1f39 100644
--- a/headerforwarder/response_writer.go
+++ b/headerforwarder/response_writer.go
@@ -18,21 +18,21 @@ import (
 	"net/http"
 )
 
-// HeaderForwarderResponseWriter is a wrapper around a http.ResponseWriter that allows us to set headers
+// ResponseWriter is a wrapper around a http.ResponseWriter that allows us to set headers
 // just before the WriteHeader function is called. These headers will be extracted from native node
 // responses, and set on the rosetta response.
-type HeaderForwarderResponseWriter struct {
+type ResponseWriter struct {
 	writer               http.ResponseWriter
 	RosettaRequestID     string
 	GetAdditionalHeaders func(string) (http.Header, bool)
 }
 
-func NewHeaderForwarderResponseWriter(
+func NewResponseWriter(
 	writer http.ResponseWriter,
 	rosettaRequestID string,
 	getAdditionalHeaders func(string) (http.Header, bool),
-) *HeaderForwarderResponseWriter {
-	return &HeaderForwarderResponseWriter{
+) *ResponseWriter {
+	return &ResponseWriter{
 		writer:               writer,
 		RosettaRequestID:     rosettaRequestID,
 		GetAdditionalHeaders: getAdditionalHeaders,
@@ -40,22 +40,22 @@ func NewHeaderForwarderResponseWriter(
 }
 
 // Header passes through to the underlying ResponseWriter instance
-func (hfrw *HeaderForwarderResponseWriter) Header() http.Header {
+func (hfrw *ResponseWriter) Header() http.Header {
 	return hfrw.writer.Header()
 }
 
 // Write passes through to the underlying ResponseWriter instance
-func (hfrw *HeaderForwarderResponseWriter) Write(b []byte) (int, error) {
+func (hfrw *ResponseWriter) Write(b []byte) (int, error) {
 	return hfrw.writer.Write(b)
 }
 
 // WriteHeader will add any final extracted headers, and then pass through to the underlying ResponseWriter instance
-func (hfrw *HeaderForwarderResponseWriter) WriteHeader(statusCode int) {
+func (hfrw *ResponseWriter) WriteHeader(statusCode int) {
 	hfrw.AddExtractedHeaders()
 	hfrw.writer.WriteHeader(statusCode)
 }
 
-func (hfrw *HeaderForwarderResponseWriter) AddExtractedHeaders() {
+func (hfrw *ResponseWriter) AddExtractedHeaders() {
 	headers, hasAdditionalHeaders := hfrw.GetAdditionalHeaders(hfrw.RosettaRequestID)
 
 	if hasAdditionalHeaders {