diff --git a/src/main/java/election_structure/Ballot.java b/src/main/java/election_structure/Ballot.java
index 9b549fd..0911baf 100644
--- a/src/main/java/election_structure/Ballot.java
+++ b/src/main/java/election_structure/Ballot.java
@@ -49,7 +49,6 @@ protected void setup() {
 			Arrays.asList(searchAgentByType("Mediator")));
 
 		sendMessage(foundAgent.get(0).getName().getLocalName(), ACLMessage.INFORM, "CHECK");
-
     }
 
     @Override
diff --git a/src/main/java/election_structure/BaseAgent.java b/src/main/java/election_structure/BaseAgent.java
index f8b816e..d5dae9e 100644
--- a/src/main/java/election_structure/BaseAgent.java
+++ b/src/main/java/election_structure/BaseAgent.java
@@ -45,6 +45,13 @@ public abstract class BaseAgent extends Agent {
 	public static final String QUORUM = "QUORUM";
 	public static final String CANDIDATURE = "CANDIDATURE";
 	public static final String PROPOSAL = "PROPOSAL";
+	public static final String CHECK = "CHECK";
+	public static final String FAILURE = "FAILURE";
+	public static final String READY = "READY";
+	public static final String RESULTS = "RESULTS";
+	public static final String ELECTIONLOG = "ELECTIONLOG";
+	public static final String CANDIDCODE = "CANDIDCODE";
+	public static final String CANDIDATE = "CANDIDATE";
 
 	public static final String ANSI_RESET = "\u001B[0m";
 	public static final String ANSI_BLUE = "\u001B[34m";
diff --git a/src/main/java/election_structure/Mediator.java b/src/main/java/election_structure/Mediator.java
index 1391f13..bb3d82d 100644
--- a/src/main/java/election_structure/Mediator.java
+++ b/src/main/java/election_structure/Mediator.java
@@ -65,19 +65,19 @@ public void action () {
 					case REGISTERED:
 						verifyElectionStatus(msg, splittedMsg); 
 						break;
-					case "CHECK":
+					case CHECK:
 						setupBallot(msg);
 						break;
-					case "FAILURE":
+					case FAILURE:
 						resetElection(myAgent);
 						break;
-					case "READY":
+					case READY:
 						startElection(splittedMsg);
 						break;
-					case "RESULTS":
+					case RESULTS:
 						processElectionResults(msg, splittedMsg);
 						break;
-					case "ELECTIONLOG":
+					case ELECTIONLOG:
 						logger.log(Level.INFO, String.format("%s %s %s", ANSI_PURPLE, msg.getContent(), ANSI_RESET));
 						resetElection(myAgent);
 						break;
@@ -161,7 +161,7 @@ private void verifyElectionStatus(ACLMessage msg, String[] splittedMsg) {
 		if( splittedMsg[2].startsWith(Integer.toString(votingCode)) )
 			registeredQuorum++;
 
-		if ( msg.getContent().endsWith("CANDIDATURE") ) {
+		if ( msg.getContent().endsWith(CANDIDATURE) ) {
 			preCandidates.add(msg.getSender());
 		}
 
diff --git a/src/main/java/election_structure/Voter.java b/src/main/java/election_structure/Voter.java
index 0207ff6..4b75f61 100644
--- a/src/main/java/election_structure/Voter.java
+++ b/src/main/java/election_structure/Voter.java
@@ -67,17 +67,17 @@ public void action () {
 					case INVITE:
 						registerForElection(this.myAgent, msg, splittedMsg);
 						break;
-					case "CANDIDCODE":
+					case CANDIDCODE:
 						myCandidatureCode = Integer.parseInt(splittedMsg[1]);
 						registerCandidature(myAgent, myCandidatureCode, msg);
 						break;
-					case "CANDIDATE":
+					case CANDIDATE:
 						String prop = msg.getContent().substring(msg.getContent().indexOf(PROPOSAL) + PROPOSAL.length() + 1); 
 
 						recvProposals.put(splittedMsg[1], prop);
 						candidatesCount++;
 						break;
-					case "RESULT":
+					case RESULTS:
 						logger.log(Level.INFO, getLogContent(splittedMsg));
 						break;
 					default:
@@ -217,7 +217,6 @@ protected void onWake() {
 	private void informVotingRegistration() {
 		ACLMessage informMsg = new ACLMessage(ACLMessage.INFORM);
 
-
 		String sendMsg = String.format("%s IN %d", REGISTERED, votingCode);
 
 		if ( candidate )