diff --git a/src/main/java/org/gcube/socialnetworking/tokenizer/StringTokenizer.java b/src/main/java/org/gcube/socialnetworking/tokenizer/StringTokenizer.java
index 491e590..b782e05 100644
--- a/src/main/java/org/gcube/socialnetworking/tokenizer/StringTokenizer.java
+++ b/src/main/java/org/gcube/socialnetworking/tokenizer/StringTokenizer.java
@@ -19,20 +19,25 @@ public class StringTokenizer {
 		this.pattern = Pattern.compile("\\s");
 	    this.matcher = pattern.matcher(originalString);
 	}
+	
+	protected Token getToken(int tokenStart) {
+		int tokenEnd = matcher.start();
+		int delimiterStart = tokenEnd;
+		int delimiterEnd = matcher.end(); 
+		String tokenString = originalString.substring(tokenStart, tokenEnd);
+		String delimiter = originalString.substring(delimiterStart, delimiterEnd);
+		Token token = new Token(tokenString, delimiter, tokenStart, tokenEnd);
+		return token;
+	}
 
 	public List<Token> getTokens() {
 		if(tokens==null) {
 			tokens = new ArrayList<>();
 			int tokenStart = 0;
 			while(matcher.find()) {
-				int tokenEnd = matcher.start();
-				String tokenString = originalString.substring(tokenStart, tokenEnd);
-				int delimiterStart = tokenEnd;
-				int delimiterEnd = matcher.end(); 
-				String delimiter = originalString.substring(delimiterStart, delimiterEnd);
-				Token token = new Token(tokenString, delimiter, tokenStart, tokenEnd);
+				Token token = getToken(tokenStart);
 				tokens.add(token);
-				tokenStart = delimiterEnd;
+				tokenStart = matcher.end();
 			}
 			if(tokenStart!=originalString.length()){
 				int tokenEnd = originalString.length();