diff --git a/app/post.go b/app/post.go
index 5a4570d3ee..fdb5ff1373 100644
--- a/app/post.go
+++ b/app/post.go
@@ -134,9 +134,11 @@ func (a *App) deduplicateCreatePost(post *model.Post) (foundPost *model.Post, er
 }
 
 func (a *App) CreatePost(post *model.Post, channel *model.Channel, triggerWebhooks bool) (savedPost *model.Post, err *model.AppError) {
-	if foundPost, err := a.deduplicateCreatePost(post); err != nil {
+	foundPost, err := a.deduplicateCreatePost(post)
+	if err != nil {
 		return nil, err
-	} else if foundPost != nil {
+	}
+	if foundPost != nil {
 		return foundPost, nil
 	}
 
diff --git a/services/mailservice/inbucket.go b/services/mailservice/inbucket.go
index 361be6449e..3e73eee0f6 100644
--- a/services/mailservice/inbucket.go
+++ b/services/mailservice/inbucket.go
@@ -89,8 +89,7 @@ func GetMailBox(email string) (results JSONMessageHeaderInbucket, err error) {
 	return record, nil
 }
 
-func GetMessageFromMailbox(email, id string) (results JSONMessageInbucket, err error) {
-
+func GetMessageFromMailbox(email, id string) (JSONMessageInbucket, error) {
 	parsedEmail := ParseEmail(email)
 
 	var record JSONMessageInbucket
@@ -102,17 +101,20 @@ func GetMessageFromMailbox(email, id string) (results JSONMessageInbucket, err e
 	}
 	defer emailResponse.Body.Close()
 
-	err = json.NewDecoder(emailResponse.Body).Decode(&record)
+	if err = json.NewDecoder(emailResponse.Body).Decode(&record); err != nil {
+		return record, err
+	}
 
 	// download attachments
 	if record.Attachments != nil && len(record.Attachments) > 0 {
 		for i := range record.Attachments {
-			if bytes, err := downloadAttachment(record.Attachments[i].DownloadLink); err != nil {
+			var bytes []byte
+			bytes, err = downloadAttachment(record.Attachments[i].DownloadLink)
+			if err != nil {
 				return record, err
-			} else {
-				record.Attachments[i].Bytes = make([]byte, len(bytes))
-				copy(record.Attachments[i].Bytes, bytes)
 			}
+			record.Attachments[i].Bytes = make([]byte, len(bytes))
+			copy(record.Attachments[i].Bytes, bytes)
 		}
 	}
 
diff --git a/services/mailservice/mail.go b/services/mailservice/mail.go
index 6cb1f66bec..174dc8a59b 100644
--- a/services/mailservice/mail.go
+++ b/services/mailservice/mail.go
@@ -136,7 +136,7 @@ func NewSMTPClientAdvanced(conn net.Conn, hostname string, connectionInfo *SmtpC
 	}
 
 	if hostname != "" {
-		err := c.Hello(hostname)
+		err = c.Hello(hostname)
 		if err != nil {
 			mlog.Error(fmt.Sprintf("Failed to to set the HELO to SMTP server %v", err))
 			return nil, model.NewAppError("SendMail", "utils.mail.connect_smtp.helo.app_error", nil, err.Error(), http.StatusInternalServerError)
@@ -273,11 +273,11 @@ func SendMail(c *smtp.Client, mimeTo, smtpTo string, from mail.Address, subject,
 		}))
 	}
 
-	if err := c.Mail(from.Address); err != nil {
+	if err = c.Mail(from.Address); err != nil {
 		return model.NewAppError("SendMail", "utils.mail.send_mail.from_address.app_error", nil, err.Error(), http.StatusInternalServerError)
 	}
 
-	if err := c.Rcpt(smtpTo); err != nil {
+	if err = c.Rcpt(smtpTo); err != nil {
 		return model.NewAppError("SendMail", "utils.mail.send_mail.to_address.app_error", nil, err.Error(), http.StatusInternalServerError)
 	}
 
diff --git a/utils/config.go b/utils/config.go
index 6feb73b5f3..997bac1219 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -308,7 +308,7 @@ func fixEnvSettingsCase(in map[string]interface{}) (out map[string]interface{},
 			return nil
 		}
 
-		out := make(map[string]interface{}, len(in))
+		fixCaseOut := make(map[string]interface{}, len(in))
 
 		for i := 0; i < t.NumField(); i++ {
 			field := t.Field(i)
@@ -316,14 +316,14 @@ func fixEnvSettingsCase(in map[string]interface{}) (out map[string]interface{},
 			key := field.Name
 			if value, ok := in[strings.ToLower(key)]; ok {
 				if valueAsMap, ok := value.(map[string]interface{}); ok {
-					out[key] = fixCase(valueAsMap, field.Type)
+					fixCaseOut[key] = fixCase(valueAsMap, field.Type)
 				} else {
-					out[key] = value
+					fixCaseOut[key] = value
 				}
 			}
 		}
 
-		return out
+		return fixCaseOut
 	}
 
 	out = fixCase(in, reflect.TypeOf(model.Config{}))
diff --git a/utils/lru.go b/utils/lru.go
index 37e0b6e64d..5a516493e4 100644
--- a/utils/lru.go
+++ b/utils/lru.go
@@ -140,8 +140,8 @@ func (c *Cache) GetOrAdd(key, value interface{}, ttl time.Duration) (actual inte
 	defer c.lock.Unlock()
 
 	// Check for existing item
-	if value, ok := c.getValue(key); ok {
-		return value, true
+	if actualValue, ok := c.getValue(key); ok {
+		return actualValue, true
 	}
 
 	c.add(key, value, ttl)
diff --git a/utils/markdown/blocks.go b/utils/markdown/blocks.go
index 14972f943e..921cdebc5a 100644
--- a/utils/markdown/blocks.go
+++ b/utils/markdown/blocks.go
@@ -77,10 +77,10 @@ func ParseBlocks(markdown string, lines []Line) (*Document, []*ReferenceDefiniti
 				didAdd := false
 				for i := lastMatchIndex; i >= 0; i-- {
 					if container, ok := openBlocks[i].(ContainerBlock); ok {
-						if newBlocks := container.AddChild(newBlocks); newBlocks != nil {
+						if addedBlocks := container.AddChild(newBlocks); addedBlocks != nil {
 							closeBlocks(openBlocks[i+1:], &referenceDefinitions)
 							openBlocks = openBlocks[:i+1]
-							openBlocks = append(openBlocks, newBlocks...)
+							openBlocks = append(openBlocks, addedBlocks...)
 							didAdd = true
 							break
 						}
diff --git a/utils/markdown/inlines.go b/utils/markdown/inlines.go
index a3abccef39..8ec0fcc963 100644
--- a/utils/markdown/inlines.go
+++ b/utils/markdown/inlines.go
@@ -398,8 +398,8 @@ func (p *inlineParser) lookForLinkOrImage() {
 				p.inlines = append(p.inlines[:d.TextNode], inline)
 			} else {
 				p.inlines = append(p.inlines[:d.TextNode], inline)
-				for element := element.Prev(); element != nil; element = element.Prev() {
-					if d := element.Value.(*delimiter); d.Type == linkOpeningDelimiter {
+				for inlineElement := element.Prev(); inlineElement != nil; inlineElement = inlineElement.Prev() {
+					if d := inlineElement.Value.(*delimiter); d.Type == linkOpeningDelimiter {
 						d.IsInactive = true
 					}
 				}