diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index fe08325bf7116ac9e21b257d0c54d55ed6ee3351..6552d397f2489f9e023deeb262edf3c3f50773b6 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -93,7 +93,7 @@ public class SessionController extends AbstractController {
 			courses.add(course);
 			final int sessionCount = sessionService.countSessions(courses);
 			if (sessionCount > 0) {
-				final String appendix = " (" + String.valueOf(sessionCount + 1) + ")";
+				final String appendix = " (" + (sessionCount + 1) + ")";
 				session.setName(session.getName() + appendix);
 				session.setShortName(session.getShortName() + appendix);
 			}
diff --git a/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java b/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java
index 77cf14b0b22473bea502ea32ea782b357c8a7c0c..4e3d4965fe7e9201387b61c3b46908cce53893df 100644
--- a/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java
+++ b/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java
@@ -26,12 +26,16 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator {
 	private IDatabaseDao dao;
 
 	@Override
-	public boolean hasPermission(final Authentication authentication, final Object targetDomainObject, final Object permission) {
+	public boolean hasPermission(
+			final Authentication authentication,
+			final Object targetDomainObject,
+			final Object permission
+			) {
 		final String username = getUsername(authentication);
 
 		if (
 				targetDomainObject instanceof Session
-				&& ! checkSessionPermission(username, ((Session)targetDomainObject).getKeyword(), permission)
+				&& !checkSessionPermission(username, ((Session) targetDomainObject).getKeyword(), permission)
 				) {
 			throw new ForbiddenException();
 		}
@@ -39,20 +43,35 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator {
 	}
 
 	@Override
-	public boolean hasPermission(final Authentication authentication, final Serializable targetId, final String targetType, final Object permission) {
+	public boolean hasPermission(
+			final Authentication authentication,
+			final Serializable targetId,
+			final String targetType,
+			final Object permission
+			) {
 		final String username = getUsername(authentication);
 
-		if ("session".equals(targetType) && ! checkSessionPermission(username, targetId, permission)) {
+		if ("session".equals(targetType) && !checkSessionPermission(username, targetId, permission)) {
 			throw new ForbiddenException();
-		} else if ("question".equals(targetType) && ! checkQuestionPermission(username, targetId, permission)) {
+		} else if (
+				"question".equals(targetType)
+				&& !checkQuestionPermission(username, targetId, permission)
+				) {
 			throw new ForbiddenException();
-		} else if ("interposedquestion".equals(targetType) && ! checkInterposedQuestionPermission(username, targetId, permission)) {
+		} else if (
+				"interposedquestion".equals(targetType)
+				&& !checkInterposedQuestionPermission(username, targetId, permission)
+				) {
 			throw new ForbiddenException();
 		}
 		return true;
 	}
 
-	private boolean checkSessionPermission(final String username, final Serializable targetId, final Object permission) {
+	private boolean checkSessionPermission(
+			final String username,
+			final Serializable targetId,
+			final Object permission
+			) {
 		if (permission instanceof String && (permission.equals("owner") || permission.equals("write"))) {
 			return dao.getSession(targetId.toString()).getCreator().equals(username);
 		} else if (permission instanceof String && permission.equals("read")) {
@@ -61,7 +80,11 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator {
 		return false;
 	}
 
-	private boolean checkQuestionPermission(final String username, final Serializable targetId, final Object permission) {
+	private boolean checkQuestionPermission(
+			final String username,
+			final Serializable targetId,
+			final Object permission
+			) {
 		if (permission instanceof String && permission.equals("owner")) {
 			final Question question = dao.getQuestion(targetId.toString());
 			if (question != null) {
@@ -75,7 +98,11 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator {
 		return false;
 	}
 
-	private boolean checkInterposedQuestionPermission(final String username, final Serializable targetId, final Object permission) {
+	private boolean checkInterposedQuestionPermission(
+			final String username,
+			final Serializable targetId,
+			final Object permission
+			) {
 		if (permission instanceof String && permission.equals("owner")) {
 			final InterposedQuestion question = dao.getInterposedQuestion(targetId.toString());
 			if (question != null) {
diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index 9d776a08ea06ce91ca5e218d6209d83dbc1a11b4..f45ed6d91c416e6285feedbb57519e8bf34215f5 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -86,7 +86,7 @@ public class UserService implements IUserService {
 		User user = null;
 
 		if (authentication instanceof OAuthAuthenticationToken) {
-			user = getOAuthUser(authentication, user);
+			user = getOAuthUser(authentication);
 		} else if (authentication instanceof CasAuthenticationToken) {
 			final CasAuthenticationToken token = (CasAuthenticationToken) authentication;
 			user = new User(token.getAssertion().getPrincipal());
@@ -105,7 +105,8 @@ public class UserService implements IUserService {
 		return user;
 	}
 
-	private User getOAuthUser(final Authentication authentication, User user) {
+	private User getOAuthUser(final Authentication authentication) {
+		User user = null;
 		final OAuthAuthenticationToken token = (OAuthAuthenticationToken) authentication;
 		if (token.getUserProfile() instanceof Google2Profile) {
 			final Google2Profile profile = (Google2Profile) token.getUserProfile();
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index e1c85a03ff1b8210961a9f98128339f71909142b..9090447a5695c7d313acc3f396175838b38d2e16 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -77,7 +77,7 @@ public class ARSnovaSocketIOServer {
 		server.stop();
 	}
 
-	public void startServer() throws Exception {
+	public void startServer() {
 		/**
 		 * hack: listen to ipv4 adresses
 		 */
@@ -151,7 +151,7 @@ public class ARSnovaSocketIOServer {
 		server.start();
 	}
 
-	public void stopServer() throws Exception {
+	public void stopServer() {
 		LOGGER.trace("In stopServer method of class: {}", getClass().getName());
 		try {
 			for (final SocketIOClient client : server.getAllClients()) {