Router.go fix + lint