diff --git a/cmd/boardvoting/handlers.go b/cmd/boardvoting/handlers.go
index ff3c05d..8e7331c 100644
--- a/cmd/boardvoting/handlers.go
+++ b/cmd/boardvoting/handlers.go
@@ -55,21 +55,21 @@ func (m *templateData) motionPaginationOptions(limit int, first, last *time.Time
 	motions := m.Motions
 
 	if len(motions) == limit && first.Before(motions[len(motions)-1].Proposed) {
-		marshalled, err := motions[len(motions)-1].Proposed.MarshalText()
+		marshaled, err := motions[len(motions)-1].Proposed.MarshalText()
 		if err != nil {
 			return fmt.Errorf("could not serialize timestamp: %w", err)
 		}
 
-		m.NextPage = string(marshalled)
+		m.NextPage = string(marshaled)
 	}
 
 	if len(motions) > 0 && last.After(motions[0].Proposed) {
-		marshalled, err := motions[0].Proposed.MarshalText()
+		marshaled, err := motions[0].Proposed.MarshalText()
 		if err != nil {
 			return fmt.Errorf("could not serialize timestamp: %w", err)
 		}
 
-		m.PrevPage = string(marshalled)
+		m.PrevPage = string(marshaled)
 	}
 
 	return nil
diff --git a/cmd/boardvoting/handlers_test.go b/cmd/boardvoting/handlers_test.go
index 4278fa4..6259b98 100644
--- a/cmd/boardvoting/handlers_test.go
+++ b/cmd/boardvoting/handlers_test.go
@@ -102,7 +102,7 @@ func TestApplication_healthCheck(t *testing.T) {
 
 		app.healthCheck(rr, r)
 
-		rs := rr.Result()
+		rs := rr.Result() //nolint:bodyclose // linters bug
 
 		defer func() { _ = rs.Body.Close() }()
 
@@ -133,7 +133,7 @@ func TestApplication_healthCheck(t *testing.T) {
 
 		app.healthCheck(rr, r)
 
-		rs := rr.Result()
+		rs := rr.Result() //nolint:bodyclose // linters bug
 
 		defer func() { _ = rs.Body.Close() }()
 
diff --git a/cmd/boardvoting/middleware_test.go b/cmd/boardvoting/middleware_test.go
index 503251c..f9d77c6 100644
--- a/cmd/boardvoting/middleware_test.go
+++ b/cmd/boardvoting/middleware_test.go
@@ -47,7 +47,7 @@ func Test_secureHeaders(t *testing.T) {
 
 	secureHeaders(next).ServeHTTP(rr, r)
 
-	rs := rr.Result()
+	rs := rr.Result() //nolint:bodyclose // linters bug
 
 	defer func() { _ = rs.Body.Close() }()
 
@@ -104,7 +104,7 @@ func TestApplication_tryAuthenticate(t *testing.T) {
 
 		app.tryAuthenticate(next).ServeHTTP(rr, r)
 
-		rs := rr.Result()
+		rs := rr.Result() //nolint:bodyclose // linters bug
 
 		defer func() { _ = rs.Body.Close() }()
 
@@ -122,7 +122,7 @@ func TestApplication_tryAuthenticate(t *testing.T) {
 
 		app.tryAuthenticate(next).ServeHTTP(rr, r)
 
-		rs := rr.Result()
+		rs := rr.Result() //nolint:bodyclose // linters bug
 
 		defer func() { _ = rs.Body.Close() }()
 
@@ -143,7 +143,7 @@ func TestApplication_tryAuthenticate(t *testing.T) {
 
 		app.tryAuthenticate(next).ServeHTTP(rr, r)
 
-		rs := rr.Result()
+		rs := rr.Result() //nolint:bodyclose // linters bug
 
 		defer func() { _ = rs.Body.Close() }()
 
diff --git a/cmd/boardvoting/notifications.go b/cmd/boardvoting/notifications.go
index 9554d2a..29866ae 100644
--- a/cmd/boardvoting/notifications.go
+++ b/cmd/boardvoting/notifications.go
@@ -219,7 +219,7 @@ func (c *ClosedDecisionNotification) GetNotificationContent(mc *mailConfig) *Not
 		data: struct {
 			*models.Motion
 		}{Motion: c.Decision},
-		subject:    fmt.Sprintf("Re: %s - %s - finalised", c.Decision.Tag, c.Decision.Title),
+		subject:    fmt.Sprintf("Re: %s - %s - finalized", c.Decision.Tag, c.Decision.Title),
 		headers:    motionReplyHeaders(c.Decision),
 		recipients: []recipientData{defaultRecipient(mc)},
 	}