diff --git a/tracker_scraper.go b/tracker_scraper.go
index <HASH>..<HASH> 100644
--- a/tracker_scraper.go
+++ b/tracker_scraper.go
@@ -26,11 +26,10 @@ func (ts *trackerScraper) statusLine() string {
 	fmt.Fprintf(&w, "%q\t%s\t%s",
 		ts.url,
 		func() string {
-			// return ts.lastAnnounce.Completed.Add(ts.lastAnnounce.Interval).Format("2006-01-02 15:04:05 -0700 MST")
-			na := ts.lastAnnounce.Completed.Add(ts.lastAnnounce.Interval).Sub(time.Now())
-			na /= time.Second
-			na *= time.Second
+			na := time.Until(ts.lastAnnounce.Completed.Add(ts.lastAnnounce.Interval))
 			if na > 0 {
+				na /= time.Second
+				na *= time.Second
 				return na.String()
 			} else {
 				return "anytime"
Tidy the next announce tracker status field