Refactor to use time.Tick instead of NewTicker