diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd86cff..af01fd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fixed default command: running `himalaya` without argument will list envelopes, as it used to be in previous versions.
+- Fixed default command: running `himalaya` without argument lists envelopes, as it used to be in previous versions.
 - Fixed bug when listing envelopes with `backend = "imap"`, `sync.enable = true` and `envelope.watch.backend = "imap"` led to unwanted IMAP connection creation (which slowed down the listing).
 
 ## [1.0.0-beta] - 2024-01-01
diff --git a/src/account/command/configure.rs b/src/account/command/configure.rs
index 49012d9..a3b1184 100644
--- a/src/account/command/configure.rs
+++ b/src/account/command/configure.rs
@@ -35,7 +35,7 @@ pub struct AccountConfigureCommand {
 
 impl AccountConfigureCommand {
     pub async fn execute(self, printer: &mut impl Printer, config: &TomlConfig) -> Result<()> {
-        info!("executing account configure command");
+        info!("executing configure account command");
 
         let account = &self.account.name;
         let (_, account_config) = config.into_toml_account_config(Some(account))?;
diff --git a/src/account/command/list.rs b/src/account/command/list.rs
index 0c73275..720680a 100644
--- a/src/account/command/list.rs
+++ b/src/account/command/list.rs
@@ -21,7 +21,7 @@ pub struct AccountListCommand {
 
 impl AccountListCommand {
     pub async fn execute(self, printer: &mut impl Printer, config: &TomlConfig) -> Result<()> {
-        info!("executing account list command");
+        info!("executing list accounts command");
 
         let accounts: Accounts = config.accounts.iter().into();
 
diff --git a/src/account/command/sync.rs b/src/account/command/sync.rs
index 1b94b30..3acc361 100644
--- a/src/account/command/sync.rs
+++ b/src/account/command/sync.rs
@@ -80,7 +80,7 @@ pub struct AccountSyncCommand {
 
 impl AccountSyncCommand {
     pub async fn execute(self, printer: &mut impl Printer, config: &TomlConfig) -> Result<()> {
-        info!("executing account sync command");
+        info!("executing sync account command");
 
         let included_folders = HashSet::from_iter(self.include_folder);
         let excluded_folders = HashSet::from_iter(self.exclude_folder);
diff --git a/src/completion/command.rs b/src/completion/command.rs
index 91b758d..7d11d3d 100644
--- a/src/completion/command.rs
+++ b/src/completion/command.rs
@@ -20,17 +20,12 @@ pub struct CompletionGenerateCommand {
 
 impl CompletionGenerateCommand {
     pub async fn execute(self) -> Result<()> {
-        info!("executing completion generate command");
+        info!("executing generate completion command");
 
         let mut cmd = Cli::command();
         let name = cmd.get_name().to_string();
         clap_complete::generate(self.shell, &mut cmd, name, &mut io::stdout());
 
-        info!(
-            "Shell script successfully generated for shell {}!",
-            self.shell
-        );
-
         Ok(())
     }
 }
diff --git a/src/email/message/template/command/forward.rs b/src/email/message/template/command/forward.rs
index 0e3c59d..d035d56 100644
--- a/src/email/message/template/command/forward.rs
+++ b/src/email/message/template/command/forward.rs
@@ -45,7 +45,7 @@ pub struct TemplateForwardCommand {
 
 impl TemplateForwardCommand {
     pub async fn execute(self, printer: &mut impl Printer, config: &TomlConfig) -> Result<()> {
-        info!("executing template forward command");
+        info!("executing forward template command");
 
         let folder = &self.folder.name;
 
diff --git a/src/email/message/template/command/save.rs b/src/email/message/template/command/save.rs
index 675429b..f972478 100644
--- a/src/email/message/template/command/save.rs
+++ b/src/email/message/template/command/save.rs
@@ -41,7 +41,7 @@ pub struct TemplateSaveCommand {
 
 impl TemplateSaveCommand {
     pub async fn execute(self, printer: &mut impl Printer, config: &TomlConfig) -> Result<()> {
-        info!("executing template save command");
+        info!("executing save template command");
 
         let folder = &self.folder.name;
 
diff --git a/src/email/message/template/command/send.rs b/src/email/message/template/command/send.rs
index bf874fa..f565ce1 100644
--- a/src/email/message/template/command/send.rs
+++ b/src/email/message/template/command/send.rs
@@ -37,7 +37,7 @@ pub struct TemplateSendCommand {
 
 impl TemplateSendCommand {
     pub async fn execute(self, printer: &mut impl Printer, config: &TomlConfig) -> Result<()> {
-        info!("executing template send command");
+        info!("executing send template command");
 
         let (toml_account_config, account_config) = config.clone().into_account_configs(
             self.account.name.as_ref().map(String::as_str),
diff --git a/src/folder/command/delete.rs b/src/folder/command/delete.rs
index 43f64fb..8ce3881 100644
--- a/src/folder/command/delete.rs
+++ b/src/folder/command/delete.rs
@@ -35,7 +35,7 @@ pub struct FolderDeleteCommand {
 
 impl FolderDeleteCommand {
     pub async fn execute(self, printer: &mut impl Printer, config: &TomlConfig) -> Result<()> {
-        info!("executing folder delete command");
+        info!("executing delete folder command");
 
         let folder = &self.folder.name;
 
diff --git a/src/manual/command.rs b/src/manual/command.rs
index 383bb2c..637982d 100644
--- a/src/manual/command.rs
+++ b/src/manual/command.rs
@@ -22,7 +22,7 @@ pub struct ManualGenerateCommand {
 
 impl ManualGenerateCommand {
     pub async fn execute(self, printer: &mut impl Printer) -> Result<()> {
-        info!("executing manual generate command");
+        info!("executing generate manuals command");
 
         let cmd = Cli::command();
         let cmd_name = cmd.get_name().to_string();