godoc refactoring