More refactoring for Go-ness