go-lint refactor