diff --git a/bot_test.go b/bot_test.go
index 5a3057d..e7aa7ac 100644
--- a/bot_test.go
+++ b/bot_test.go
@@ -373,7 +373,10 @@ func TestSendWithNewStickerAndKeyboardHide(t *testing.T) {
 	bot, _ := getBot(t)
 
 	msg := tgbotapi.NewStickerUpload(ChatID, "tests/image.jpg")
-	msg.ReplyMarkup = tgbotapi.ReplyKeyboardRemove{true, false}
+	msg.ReplyMarkup = tgbotapi.ReplyKeyboardRemove{
+		RemoveKeyboard: true,
+		Selective:      false,
+	}
 	_, err := bot.Send(msg)
 
 	if err != nil {
@@ -386,7 +389,10 @@ func TestSendWithExistingStickerAndKeyboardHide(t *testing.T) {
 	bot, _ := getBot(t)
 
 	msg := tgbotapi.NewStickerShare(ChatID, ExistingStickerFileID)
-	msg.ReplyMarkup = tgbotapi.ReplyKeyboardRemove{true, false}
+	msg.ReplyMarkup = tgbotapi.ReplyKeyboardRemove{
+		RemoveKeyboard: true,
+		Selective:      false,
+	}
 
 	_, err := bot.Send(msg)
 
@@ -399,7 +405,7 @@ func TestSendWithExistingStickerAndKeyboardHide(t *testing.T) {
 func TestGetFile(t *testing.T) {
 	bot, _ := getBot(t)
 
-	file := tgbotapi.FileConfig{ExistingPhotoFileID}
+	file := tgbotapi.FileConfig{FileID: ExistingPhotoFileID}
 
 	_, err := bot.GetFile(file)
 
diff --git a/types.go b/types.go
index 38bc0f6..d3d30dc 100644
--- a/types.go
+++ b/types.go
@@ -232,9 +232,9 @@ func (m *Message) CommandArguments() string {
 	entity := (*m.Entities)[0]
 	if len(m.Text) == entity.Length {
 		return "" // The command makes up the whole message
-	} else {
-		return m.Text[entity.Length+1:]
 	}
+
+	return m.Text[entity.Length+1:]
 }
 
 // MessageEntity contains information about data in a Message.
@@ -772,6 +772,7 @@ type PreCheckoutQuery struct {
 	OrderInfo        *OrderInfo `json:"order_info,omitempty"`
 }
 
+// Error is an error containing extra information returned by the Telegram API.
 type Error struct {
 	Message string
 	ResponseParameters