Added some godoc comments