diff --git a/overlord/state/timings.go b/overlord/state/timings.go
index 77cf03a0056..2876787b315 100644
--- a/overlord/state/timings.go
+++ b/overlord/state/timings.go
@@ -27,7 +27,11 @@ import (
 // Returned Timings tree has "task-id", "change-id" and "task-kind"
 // tags set automatically from the respective task.
 func TimingsForTask(task *Task) *timings.Timings {
-	tags := map[string]string{"task-id": task.ID(), "task-kind": task.Kind(), "task-status": task.Status().String()}
+	tags := map[string]string{
+		"task-id":     task.ID(),
+		"task-kind":   task.Kind(),
+		"task-status": task.Status().String(),
+	}
 	if chg := task.Change(); chg != nil {
 		tags["change-id"] = chg.ID()
 	}
diff --git a/timings/state.go b/timings/state.go
index 962721e29db..2d9bc17298f 100644
--- a/timings/state.go
+++ b/timings/state.go
@@ -155,9 +155,11 @@ func (t *Timings) Save(s GetSaver) {
 	s.SaveTimings(stateTimings)
 }
 
-// Get returns timings for which filter predicate is true and filters out nested timings whose level is greater than maxLevel.
+// Get returns timings for which filter predicate is true and filters
+// out nested timings whose level is greater than maxLevel.
 // Negative maxLevel value disables filtering by level.
-// If GetSaver is a state.State, it's responsibility of the caller to lock the state before calling this function.
+// If GetSaver is a state.State, it's responsibility of the caller to
+// lock the state before calling this function.
 func Get(s GetSaver, maxLevel int, filter func(tags map[string]string) bool) ([]*TimingsInfo, error) {
 	var stateTimings []rootTimingsJSON
 	if err := s.GetMaybeTimings(&stateTimings); err != nil {