Merge "Refactor Go code"