diff --git a/queries/java/locals.scm b/queries/java/locals.scm
index a7a624289..1d59fee90 100644
--- a/queries/java/locals.scm
+++ b/queries/java/locals.scm
@@ -1,5 +1,7 @@
-; SCOPES
+;; SCOPES
+
 ; declarations
+
 (program) @scope
 (class_declaration
   body: (_) @scope)
@@ -11,9 +13,11 @@
 (enhanced_for_statement) @scope
 
 ; block
+
 (block) @scope
 
 ; if/else
+
 (if_statement) @scope ; if+else
 (if_statement
   consequence: (_) @scope) ; if body in case there are no braces
@@ -21,10 +25,12 @@
   alternative: (_) @scope) ; else body in case there are no braces
 
 ; try/catch
+
 (try_statement) @scope ; covers try+catch, individual try and catch are covered by (block)
 (catch_clause) @scope ; needed because `Exception` variable
 
 ; loops
+
 (for_statement) @scope ; whole for_statement because loop iterator variable
 (for_statement         ; "for" body in case there are no braces
   body: (_) @scope)
@@ -38,32 +44,36 @@
 (constructor_declaration) @scope
 (method_declaration) @scope
 
+;; DEFINITIONS
 
-; DEFINITIONS
 (package_declaration
   (identifier) @definition.namespace)
+
 (class_declaration
   name: (identifier) @definition.type)
 (record_declaration
   name: (identifier) @definition.type)
+
 (enum_declaration
   name: (identifier) @definition.enum)
+
 (method_declaration
   name: (identifier) @definition.method)
 
 (local_variable_declaration
   declarator: (variable_declarator
                 name: (identifier) @definition.var))
-(formal_parameter
-  name: (identifier) @definition.var)
-(catch_formal_parameter
-  name: (identifier) @definition.var)
-(inferred_parameters (identifier) @definition.var) ; (x,y) -> ...
-(lambda_expression
-    parameters: (identifier) @definition.var) ; x -> ...
 (enhanced_for_statement ; for (var item : items) {
   name: (identifier) @definition.var)
 
+(formal_parameter
+  name: (identifier) @definition.parameter)
+(catch_formal_parameter
+  name: (identifier) @definition.parameter)
+(inferred_parameters (identifier) @definition.parameter) ; (x,y) -> ...
+(lambda_expression
+    parameters: (identifier) @definition.parameter) ; x -> ...
+
 ((scoped_identifier
   (identifier) @definition.import)
  (#has-ancestor? @definition.import import_declaration))
@@ -72,6 +82,8 @@
   declarator: (variable_declarator
                 name: (identifier) @definition.field))
 
-; REFERENCES
+;; REFERENCES
+
 (identifier) @reference
+
 (type_identifier) @reference