Review comments, add godoc