diff --git a/snippets/java.snippets b/snippets/java.snippets
index 75c1dfe..f03c2e0 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -5,7 +5,7 @@ snippet pu
 	public
 snippet pr
 	private
-
+##
 ## Annotations
 snippet before
 	@Before
@@ -22,8 +22,8 @@ snippet om
 snippet oo
 	@OneToOne
 	${1}
-
-# Basic Java packages and import
+##
+## Basic Java packages and import
 snippet im
 	import
 snippet j.b
@@ -36,7 +36,7 @@ snippet j.n
 	java.net.
 snippet j.u
 	java.util.
-
+##
 ## Class
 snippet cl
 	class ${1:`Filename("", "untitled")`} ${2}
@@ -44,25 +44,25 @@ snippet in
 	interface ${1:`Filename("", "untitled")`} ${2:extends Parent}${3}
 snippet tc
 	public class ${1:`Filename()`} extends ${2:TestCase}
-
+##
 ## Class Enhancements
 snippet ext
 	extends 
 snippet imp
 	implements
-
+##
 ## Comments
 snippet /*
 	/*
 	 * ${1}
 	 */
-
+##
 ## Constants
 snippet co
 	static public final ${1:String} ${2:var} = ${3};${4}
 snippet cos
 	static public final String ${1:var} = "${2}";${3}
-
+##
 ## Control Statements
 snippet case
 	case ${1}:
@@ -80,15 +80,15 @@ snippet sw
 	switch (${1}) {
 		${2}
 	}
-
+##
 ## Create a Method
 snippet m
 	${1:void} ${2:method}(${3}) ${4:throws }${5}
-
+##
 ## Create a Variable
 snippet v
 	${1:String} ${2:var}${3: = null}${4};${5}
-
+##
 ## Enhancements to Methods, variables, classes, etc.
 snippet ab
 	abstract
@@ -98,7 +98,7 @@ snippet st
 	static
 snippet sy
 	synchronized
-
+##
 ## Error Methods
 snippet err
 	System.err.print("${1:Message}");
@@ -106,7 +106,7 @@ snippet errf
 	System.err.printf("${1:Message}", ${2:exception});
 snippet errln
 	System.err.println("${1:Message}");
-
+##
 ## Exception Handling
 snippet as
 	assert ${1:test} : "${2:Failure message}";${3}
@@ -127,13 +127,13 @@ snippet tryf
 	} catch(${1:Exception} ${2:e}) {
 	} finally {
 	}
-
+##
 ## Find Methods
 snippet findall
 	List<${1:listName}> ${2:items} = ${1}.findAll();${3}
 snippet findbyid
 	${1:var} ${2:item} = ${1}.findById(${3});${4}
-
+##
 ## Javadocs
 snippet /**
 	/**
@@ -149,7 +149,7 @@ snippet @pa
 	@param ${1:param}
 snippet @re
 	@return ${1:param}
-
+##
 ## Logger Methods
 snippet debug
 	Logger.debug(${1:param});${2}
@@ -159,7 +159,7 @@ snippet info
 	Logger.info(${1:param});${2}
 snippet warn
 	Logger.warn(${1:param});${2}
-
+##
 ## Loops
 snippet enfor
 	for (${1} : ${2}) ${3}
@@ -167,13 +167,13 @@ snippet for
 	for (${1}; ${2}; ${3}) ${4}
 snippet wh
 	while (${1}) ${2}
-
+##
 ## Main method
 snippet main
 	public static void main (String[] args) {
 		${1:/* code */}
 	}
-
+##
 ## Print Methods
 snippet print
 	System.out.print("${1:Message");
@@ -181,7 +181,7 @@ snippet printf
 	System.out.printf("${1:Message", ${2:args});
 snippet println
 	System.out.println(${1});
-
+##
 ## Render Methods
 snippet ren
 	render(${1:param});${2}
@@ -193,7 +193,7 @@ snippet renj
 	renderJSON(${1:param});${2}
 snippet renx
 	renderXml(${1:param});${2}
-
+##
 ## Setter and Getter Methods
 snippet set
 	$1 void set$3($2 $4){
@@ -203,13 +203,13 @@ snippet get
 	${1:public} ${2:String} get${3:}(){
 		return this.${4:};
 	}
-
+##
 ## Terminate Methods or Loops
 snippet re
 	return
 snippet br
 	break;
-
+##
 ## Test Methods
 snippet t
 	public void test${1:Name}() throws Exception {
@@ -220,11 +220,11 @@ snippet test
 	public void test${1:Name}() throws Exception {
 		${2}
 	}
-
+##
 ## Utils
 snippet Sc
 	Scanner
-
+##
 ## Miscellaneous
 snippet action
 	public static void ${1:index}(${2:args}) { ${3} }
@@ -234,8 +234,6 @@ snippet rnfin
 	notFoundIfNull(${1:param});${2}
 snippet rr
 	redirect(${1:param});${2}
-snippet rst
-	ResultSet ${1:rst}${2: = null}${3};${4}
 snippet ru
 	unauthorized(${1:param});${2}
 snippet unless