diff --git a/pkg/infrastructure/telegram/handler/anonymousmessages.go b/pkg/infrastructure/telegram/handler/anonymousmessages.go
index 37706ab..b3d5a91 100644
--- a/pkg/infrastructure/telegram/handler/anonymousmessages.go
+++ b/pkg/infrastructure/telegram/handler/anonymousmessages.go
@@ -10,19 +10,19 @@ import (
 	"github.com/go-telegram/bot/models"
 )
 
-func NewAnonymousMessagesHandler(logger jsonlog.Logger, ownerChatId int) bot.HandlerFunc {
+func NewAnonymousMessagesHandler(logger jsonlog.Logger, ownerChatID int) bot.HandlerFunc {
 	return func(ctx context.Context, b *bot.Bot, update *models.Update) {
 		if update.Message == nil {
 			return
 		}
 
-		if ownerChatId == 0 {
+		if ownerChatID == 0 {
 			logger.Info(fmt.Sprintf("owner chat ID not set. set to %d to use the last chat", update.Message.Chat.ID))
 			return
 		}
 
 		params := &bot.CopyMessageParams{
-			ChatID:     ownerChatId,
+			ChatID:     ownerChatID,
 			FromChatID: update.Message.Chat.ID,
 			MessageID:  update.Message.ID,
 		}
diff --git a/pkg/infrastructure/telegram/middleware/loggingmiddleware.go b/pkg/infrastructure/telegram/middleware/loggingmiddleware.go
index 1eac382..54869fc 100644
--- a/pkg/infrastructure/telegram/middleware/loggingmiddleware.go
+++ b/pkg/infrastructure/telegram/middleware/loggingmiddleware.go
@@ -27,7 +27,7 @@ func NewLoggingMiddleware(logger jsonlog.Logger) bot.Middleware {
 				WithField(usernameField, update.Message.From.Username)
 
 			text := update.Message.Text
-			if len(update.Message.Caption) > 0 {
+			if update.Message.Caption != "" {
 				text = update.Message.Caption
 			}