diff --git a/apidrawing.go b/apidrawing.go
index d14bbf2..88cd0de 100644
--- a/apidrawing.go
+++ b/apidrawing.go
@@ -116,7 +116,7 @@ func (p *Paragraph) AddAnchorDrawing(pic []byte) (*Run, error) {
 	}
 	idn := int(atomic.AddUintptr(&p.file.imageID, 1))
 	id := strconv.Itoa(idn)
-	rId := p.file.addImage(Media{Name: "image" + id + "." + format, Data: pic})
+	rid := p.file.addImage(Media{Name: "image" + id + "." + format, Data: pic})
 	w, h := int64(sz.Width), int64(sz.Height)
 	if float64(w)/float64(h) > 1.2 {
 		h = A4_EMU_MAX_WIDTH * h / w
@@ -167,7 +167,7 @@ func (p *Paragraph) AddAnchorDrawing(pic []byte) (*Run, error) {
 						},
 						BlipFill: &PICBlipFill{
 							Blip: ABlip{
-								Embed:  rId,
+								Embed:  rid,
 								Cstate: "print",
 							},
 						},
diff --git a/apilink.go b/apilink.go
index fb6727c..e33a8a9 100644
--- a/apilink.go
+++ b/apilink.go
@@ -6,9 +6,9 @@ const (
 
 // AddLink adds an hyperlink to paragraph
 func (p *Paragraph) AddLink(text string, link string) *Hyperlink {
-	rId := p.file.addLinkRelation(link)
+	rid := p.file.addLinkRelation(link)
 	hyperlink := &Hyperlink{
-		ID: rId,
+		ID: rid,
 		Run: Run{
 			RunProperties: &RunProperties{
 				RunStyle: &RunStyle{
diff --git a/docxlib.go b/docxlib.go
index 94e44d3..ed4a87e 100644
--- a/docxlib.go
+++ b/docxlib.go
@@ -77,7 +77,7 @@ func Parse(reader io.ReaderAt, size int64) (doc *Docx, err error) {
 	return
 }
 
-// Write allows to save a docx to a writer
+// WriteTo allows to save a docx to a writer
 func (f *Docx) WriteTo(writer io.Writer) (_ int64, err error) {
 	zipWriter := zip.NewWriter(writer)
 	defer zipWriter.Close()
diff --git a/structdrawing.go b/structdrawing.go
index d04850e..9560391 100644
--- a/structdrawing.go
+++ b/structdrawing.go
@@ -634,6 +634,7 @@ func (a *ABlip) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	return nil
 }
 
+// AAlphaModFix ...
 type AAlphaModFix struct {
 	XMLName xml.Name `xml:"a:alphaModFix,omitempty"`
 	Amount  int      `xml:"amt,attr"`
diff --git a/structpara.go b/structpara.go
index 3c99e61..046c7b1 100644
--- a/structpara.go
+++ b/structpara.go
@@ -72,6 +72,7 @@ func (p *Paragraph) String() string {
 	return sb.String()
 }
 
+// MarshalXML ...
 func (p *Paragraph) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
 	err := e.EncodeToken(start)
 	if err != nil {