diff --git a/telegram/utils.go b/telegram/utils.go
index 4c365a3..99f9b68 100644
--- a/telegram/utils.go
+++ b/telegram/utils.go
@@ -1009,8 +1009,9 @@ func (c *Client) OpenPhotoFile(photoFile *client.File, priority int32) (*os.File
 	file, err := os.Open(path)
 	if err == nil {
 		return file, path, nil
+	} else
 	// obtain the photo right now if still not downloaded
-	} else if !photoFile.Local.IsDownloadingCompleted {
+	if !photoFile.Local.IsDownloadingCompleted {
 		tdFile, tdErr := c.DownloadFile(photoFile.Id, priority, true)
 		if tdErr == nil {
 			path = tdFile.Local.Path
diff --git a/xmpp/gateway/gateway.go b/xmpp/gateway/gateway.go
index 367a406..d4620e6 100644
--- a/xmpp/gateway/gateway.go
+++ b/xmpp/gateway/gateway.go
@@ -76,7 +76,7 @@ func SetNickname(to string, from string, nickname string, component *xmpp.Compon
 		Extensions: []stanza.MsgExtension{
 			stanza.PubSubEvent{
 				EventElement: stanza.ItemsEvent{
-					Node:  NSNick,
+					Node: NSNick,
 					Items: []stanza.ItemEvent{
 						stanza.ItemEvent{
 							Any: &stanza.Node{
diff --git a/xmpp/handlers.go b/xmpp/handlers.go
index 1d8f2bd..7c671d9 100644
--- a/xmpp/handlers.go
+++ b/xmpp/handlers.go
@@ -474,7 +474,7 @@ func makeVCardPayload(typ byte, id, fn, photo, nickname, given, family, tel, inf
 				Node: NodeVCard4,
 				List: []stanza.Item{
 					stanza.Item{
-						Id:  id,
+						Id: id,
 						Any: &stanza.Node{
 							XMLName: xml.Name{Local: "vcard"},
 							Attrs: []xml.Attr{