diff --git a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
index 25f1d71..96eac7b 100644
--- a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
+++ b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
@@ -97,7 +97,7 @@
 		return model;
 	}
 
-	public DataflowChannelGenerator parseChannel(final DataFlowModel model) 
+	public DataflowChannelGenerator parseChannel(DataFlowModel model) 
 			throws 
 			ExpectedLeftCurlyBracket, ExpectedRightBracket, ExpectedAssignment,
 			ExpectedRHSExpression, WrongLHSExpression, WrongRHSExpression, 
@@ -150,7 +150,7 @@
 		return channel;
 	}
 
-	public void parseInit(final DataFlowModel model) 
+	public void parseInit(DataFlowModel model) 
 			throws 
 			ExpectedLeftCurlyBracket, ExpectedAssignment, ExpectedRHSExpression, WrongRHSExpression, ExpectedRightBracket 
 	{
@@ -183,7 +183,7 @@
 		}
 	}
 
-	public ChannelMember parseChannelMember(final DataFlowModel model, final String inOrOutOrRef) 
+	public ChannelMember parseChannelMember(DataFlowModel model, final String inOrOutOrRef) 
 			throws 
 			ExpectedRightBracket, ExpectedStateTransition, ExpectedEquals, 
 			ExpectedRHSExpression, WrongLHSExpression, WrongRHSExpression
@@ -239,7 +239,7 @@
 		return channelMember;
 	}
 
-	public Expression parseTerm(final TokenStream stream, final DataFlowModel model) 
+	public Expression parseTerm(TokenStream stream, DataFlowModel model) 
 			throws ExpectedRightBracket
 	{
 		ArrayList<Expression> expressions = new ArrayList<>();
diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java
index 584792a..c2ab83b 100644
--- a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java
+++ b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java
@@ -72,7 +72,7 @@
 	 * 
 	 * @param graph
 	 */
-	public void doParseGeometry(final mxGraph graph) 
+	public void doParseGeometry(mxGraph graph) 
 			throws ExpectedRightBracket, ExpectedChannel, ExpectedChannelName, ExpectedLeftCurlyBracket, ExpectedInOrOutOrRefKeyword, ExpectedStateTransition, ExpectedEquals, ExpectedRHSExpression, WrongLHSExpression, WrongRHSExpression, ExpectedAssignment, ExpectedModel, ExpectedGeometry, ExpectedNode, ExpectedResource, ExpectedFormulaChannel, ExpectedIoChannel{
 
 		parseGeometry(graph);
@@ -109,7 +109,7 @@
 	 * @param stream
 	 * @param graph
 	 */
-	private void parseGeometry(final mxGraph graph)
+	private void parseGeometry(mxGraph graph)
 			throws ExpectedRightBracket, ExpectedChannel, ExpectedChannelName, ExpectedLeftCurlyBracket, ExpectedInOrOutOrRefKeyword, ExpectedStateTransition, ExpectedEquals, ExpectedRHSExpression, WrongLHSExpression, WrongRHSExpression, ExpectedAssignment,ExpectedModel, ExpectedGeometry, ExpectedNode, ExpectedResource, ExpectedFormulaChannel, ExpectedIoChannel {
 
 		if (!isMatchKeyword(stream.next(), GEOMETRY_GROUP)) throw new ExpectedGeometry(stream.getLine());
diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java
index ae11f05..c380e66 100644
--- a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java
+++ b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java
@@ -50,7 +50,7 @@
 	 * @param editor
 	 * @param model
 	 */	
-	public void doParseWebService(final WebServiceEditor editor, final DataFlowModel model)
+	public void doParseWebService(WebServiceEditor editor, DataFlowModel model)
 			throws 
 			ExpectedWebService, ExpectedBaseURL, ExpectedResources, 
 			ExpectedLeftCurlyBracket, ExpectedRightBracket, ExpectedAssignment
@@ -93,7 +93,7 @@
 				// generate <IdentifireTemplate> here.
 				String resourceName = stream.next();
 				IdentifierTemplate identifierTemplate = model.getIdentifierTemplate(resourceName);
-				service = service.addIdentifireTemplate(identifierTemplate);
+				service.addIdentifireTemplate(identifierTemplate);
 
 				if (!isMatchKeyword(stream.checkNext(), COMMA)) break;