diff --git a/README.md b/README.md
index 26b4cb5..a416395 100644
--- a/README.md
+++ b/README.md
@@ -461,7 +461,7 @@ chsrc set rust | cargo | crate
 chsrc set rustup
 
 chsrc set go
-chsrc set java    | maven | mvn | gradle
+chsrc set java    | maven | mvn | maven-daemon | mvnd | gradle
 chsrc set clojure | clojars
 chsrc set dart    | pub
 chsrc set flutter
@@ -582,4 +582,4 @@ chsrc set conda  | anaconda
 [@Efterklang]:     https://github.com/Efterklang
 [@wickdynex]:      https://github.com/wickdynex
 [@YU-7]:           https://github.com/YU-7
-[@sanchuanhehe]:   https://github.com/sanchuanhehe
+[@sanchuanhehe]:   https://github.com/sanchuanhehe
\ No newline at end of file
diff --git a/src/framework/core.c b/src/framework/core.c
index c2715f7..971e1a7 100644
--- a/src/framework/core.c
+++ b/src/framework/core.c
@@ -607,7 +607,9 @@ measure_speed_for_url (void *url)
   if (in_custom_user_agent_mode())
     {
       user_agent = strdup("maven/3.9.11");
-    }else{
+    }
+  else
+    {
       user_agent = xy_2strjoin("chsrc/", Chsrc_Version);
     }
   char *os_devnull = xy_os_devnull;
diff --git a/src/recipe/lang/Java.c b/src/recipe/lang/Java.c
index 8acb264..376a2fe 100644
--- a/src/recipe/lang/Java.c
+++ b/src/recipe/lang/Java.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  * ------------------------------------------------------------*/
 
-def_target(pl_java, "java/maven/mvn/gradle");
+def_target(pl_java, "java/maven/mvn/maven-daemon/mvnd/gradle");
 
 void
 pl_java_prelude ()
@@ -51,26 +51,26 @@ pl_java_check_cmd (bool *maven_exist, bool *gradle_exist, bool *maven_daemon_exi
 }
 
 bool
-chef_is_home (const char *str)
+pl_java_is_home (const char *str)
 {
   return (xy_str_start_with (str, "Maven home:"));
 }
 
-char*
-pl_java_find_maven_home (const char *source)
+bool
+pl_java_find_maven_home (const char *line)
 {
-  if(chef_is_home(source))
+  if(pl_java_is_home(line))
     {
-      char *maven_home = xy_str_delete_prefix (source, "Maven home: ");
+      return true;
     }
+  return false;
 }
 
 char *
 pl_java_find_maven_config ()
 {
-  char *maven_home = xy_run_iter ("mvn -v", 0, pl_java_find_maven_home);
-  maven_home = xy_str_strip (maven_home);
-
+  char *maven_home_line = xy_run_iter ("mvn -v", 0, pl_java_find_maven_home);
+  char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: ");
   char *maven_config = xy_normalize_path (xy_2strjoin (maven_home, "/conf/settings.xml"));
   return maven_config;
 }
@@ -79,10 +79,8 @@ pl_java_find_maven_config ()
 char *
 pl_java_find_maven_daemon_config ()
 {
-  char *buf = xy_run_iter ("mvnd -v", 0, pl_java_find_maven_home);
-  char *maven_home = xy_str_delete_prefix (buf, "Maven daemon home: ");
-  maven_home = xy_str_strip (maven_home);
-
+  char *maven_home_line = xy_run_iter ("mvnd -v", 0, pl_java_find_maven_home);
+  char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: ");
   char *maven_config = xy_normalize_path (xy_2strjoin (maven_home, "/conf/settings.xml"));
   return maven_config;
 }