diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
index fa6b3e95f2b036f1bedd6fe4d7d22492e0b279f9..a1976d03ac49e3e69139777a56ef3a45b7f181d9 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
@@ -3,7 +3,7 @@ package de.deadlocker8.budgetmaster.accounts;
 import de.deadlocker8.budgetmaster.authentication.User;
 import de.deadlocker8.budgetmaster.authentication.UserRepository;
 import de.deadlocker8.budgetmaster.services.AccessAllEntities;
-import de.deadlocker8.budgetmaster.services.Resetable;
+import de.deadlocker8.budgetmaster.services.Resettable;
 import de.deadlocker8.budgetmaster.transactions.TransactionService;
 import de.deadlocker8.budgetmaster.utils.Strings;
 import de.thecodelabs.utils.util.Localization;
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Optional;
 
 @Service
-public class AccountService implements Resetable, AccessAllEntities<Account>
+public class AccountService implements Resettable, AccessAllEntities<Account>
 {
 	private static final Logger LOGGER = LoggerFactory.getLogger(AccountService.class);
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java b/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java
index 1ec47586f5227a9ff8fbfa2252f26d95714a23f6..bcef120f3a51e93fa3e1b45a87d63ecfcfb1d007 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java
@@ -5,7 +5,7 @@ import java.util.List;
 
 public class PreLoginUrlBlacklist
 {
-	private List<String> blacklist;
+	private final List<String> blacklist;
 
 	public PreLoginUrlBlacklist()
 	{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java b/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java
index ded80d7e6f729cdc84e5b6121d2a8f62cee1b94f..aafbf6f3dceda391de67d882e6c803212fcbe786 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java
@@ -16,7 +16,8 @@ public class UserDetailsServiceImpl implements UserDetailsService
 	private final UserRepository userRepository;
 
 	@Autowired
-	public UserDetailsServiceImpl(UserRepository userRepository) {
+	public UserDetailsServiceImpl(UserRepository userRepository)
+	{
 		this.userRepository = userRepository;
 	}
 
@@ -26,7 +27,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
 	{
 		User user = userRepository.findByName(username);
 
-		if (user == null)
+		if(user == null)
 		{
 			throw new UsernameNotFoundException(username);
 		}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java b/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
index 7269e1010fb079d0c2b3e1b1db6c9355bbcb8199..47af6f10782613901ddd205ef732885a2c7e2b24 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
@@ -18,9 +18,9 @@ import org.springframework.security.web.RedirectStrategy;
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter
 {
-	private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+	private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
 	private final UserDetailsService userDetailsService;
-	private PreLoginUrlBlacklist preLoginUrlBlacklist;
+	private final PreLoginUrlBlacklist preLoginUrlBlacklist;
 
 	@Autowired
 	public WebSecurityConfig(UserDetailsServiceImpl userDetailsService)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java b/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java
index 5e3c0fc1feeb2b5426f508cc454fd29562af14e0..da45a1e42133dd59d6d86d8027a99660516a91c8 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java
@@ -14,8 +14,8 @@ public enum AutoBackupStrategy
 	GIT_LOCAL("settings.backup.auto.strategy.git.local", LocalGitBackupTask.class),
 	GIT_REMOTE("settings.backup.auto.strategy.git.remote", RemoteGitBackupTask.class);
 
-	private String localizationKey;
-	private Class<? extends BackupTask> backupTaskType;
+	private final String localizationKey;
+	private final Class<? extends BackupTask> backupTaskType;
 
 	AutoBackupStrategy(String localizationKey, Class<? extends BackupTask> backupTaskType)
 	{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
index 7a85cdf150ddfe3199926fde73153180731fd23e..5f74fff5b199eb1a5ddfa3d11252484cf1b504db 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
@@ -150,5 +150,4 @@ public class CategoryController extends BaseController
 		model.addAttribute("category", category);
 		model.addAttribute("fontawesomeIcons", FontAwesomeIcons.ICONS);
 	}
-
 }
\ No newline at end of file
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java
index 7632a5bbe0c072fcdaee5bf068e7c675388348f6..7f0f22d1ef148121c547876094c9ac51da6509c2 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.categories;
 
 import de.deadlocker8.budgetmaster.services.AccessAllEntities;
-import de.deadlocker8.budgetmaster.services.Resetable;
+import de.deadlocker8.budgetmaster.services.Resettable;
 import de.deadlocker8.budgetmaster.transactions.Transaction;
 import de.deadlocker8.budgetmaster.utils.Strings;
 import de.thecodelabs.utils.util.Localization;
@@ -16,7 +16,7 @@ import java.util.NoSuchElementException;
 import java.util.Optional;
 
 @Service
-public class CategoryService implements Resetable, AccessAllEntities<Category>
+public class CategoryService implements Resettable, AccessAllEntities<Category>
 {
 	private static final Logger LOGGER = LoggerFactory.getLogger(CategoryService.class);
 	private final CategoryRepository categoryRepository;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java
index 8d0cb13a2fca440a772f5e55d33bdc98a83cb102..850e688fc9207cea2e819b08e777db0a3a99193c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.charts;
 
 import de.deadlocker8.budgetmaster.services.AccessAllEntities;
-import de.deadlocker8.budgetmaster.services.Resetable;
+import de.deadlocker8.budgetmaster.services.Resettable;
 import org.padler.natorder.NaturalOrderComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,14 +13,14 @@ import java.util.List;
 import java.util.Optional;
 
 @Service
-public class ChartService implements Resetable, AccessAllEntities<Chart>
+public class ChartService implements Resettable, AccessAllEntities<Chart>
 {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ChartService.class);
 
 	private static final String PATTERN_OLD_CONTAINER_ID = "Plotly.newPlot('chart-canvas',";
 	private static final String PATTERN_DYNAMIC_CONTAINER_ID = "Plotly.newPlot('containerID',";
 
-	private ChartRepository chartRepository;
+	private final ChartRepository chartRepository;
 
 	@Autowired
 	public ChartService(ChartRepository categoryRepository)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java b/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java
index c7ed16289f4c948599b695f79e9ce4a78aa3c52e..15ce979414e293c686d0ac18ec3df5531f566f41 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java
@@ -4,8 +4,8 @@ import de.thecodelabs.utils.util.Localization;
 
 public class NewsEntry
 {
-	private String headline;
-	private String description;
+	private final String headline;
+	private final String description;
 
 	public NewsEntry(String headline, String description)
 	{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
index 03cf97f3b77c05053785ab53ab2369fb93f15bc9..fa3d609762d4476df901116d3b193539bdcb045c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
@@ -13,8 +13,8 @@ import java.text.MessageFormat;
 public class DatabaseParser
 {
 	final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
-	private String jsonString;
-	private Category categoryNone;
+	private final String jsonString;
+	private final Category categoryNone;
 
 	public DatabaseParser(String json, Category categoryNone)
 	{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java
index 8254b2fd7c15df769a29827d149d46a09cd2eac8..e66c202b7593b4df1f183d664cf1f52a9ac536e9 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java
@@ -23,7 +23,7 @@ import java.util.List;
 public class DatabaseParser_v3
 {
 	final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
-	private String jsonString;
+	private final String jsonString;
 	protected List<Category> categories;
 	protected List<Account> accounts;
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java
index 2f333ca432cfec42886acc4574bfd9210ea21b3f..c73b40efa5fe99cba3feda7e2ac61b06e04097bf 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java
@@ -19,7 +19,7 @@ import java.util.Optional;
 public class DatabaseParser_v4 extends DatabaseParser_v3
 {
 	final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
-	private String jsonString;
+	private final String jsonString;
 
 	protected List<Transaction> transactions;
 	protected List<Template> templates;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
index b087aac1d27d686d5dac2f8009841da217fc7275..39278f1404fe469cb73dbad0af8ee160fff9ec33 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
@@ -17,7 +17,7 @@ import java.util.Optional;
 public class DatabaseParser_v5 extends DatabaseParser_v4
 {
 	final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
-	private String jsonString;
+	private final String jsonString;
 
 	protected List<Chart> charts;
 	protected List<Image> images;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java b/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java
index 9b8557b3fe18235ad1b99837ada632654bea4f4d..7b4e82d20947b52fc463e8221227bb91fba45317 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java
@@ -8,7 +8,6 @@ public enum ImageFileExtension
 	JPG("jpg", "jpeg"),
 	SVG("svg", "svg+xml");
 
-
 	private final String fileExtension;
 	private final String base64Type;
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java b/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java
index 0a6333813df1ca5bee0404c1bd50118b98721d8c..ccc0a61ef8b1d4d1669d69e568d43d2a5bc69f18 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.images;
 
 import de.deadlocker8.budgetmaster.accounts.Account;
-import de.deadlocker8.budgetmaster.services.Resetable;
+import de.deadlocker8.budgetmaster.services.Resettable;
 import de.thecodelabs.utils.util.Localization;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Optional;
 
 @Service
-public class ImageService implements Resetable
+public class ImageService implements Resettable
 {
 	private final ImageRepository imageRepository;
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java b/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
index dc536813bb1c6e003d55c784af92a32c3e0fe85b..3e0e9b21ca72552a77b7ed20735a0dc59d362500 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
@@ -46,7 +46,6 @@ public class MediaController extends BaseController
 		}
 		else
 		{
-
 			try
 			{
 				imageService.saveImageFile(file);
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java
index 9ddb3d98f72f089e31f38ae9222da8b11c40d258..3237ff418e5c5503fe8649d08c2e21c278376bb8 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java
@@ -8,11 +8,11 @@ import java.util.List;
 
 public class ReportConfiguration
 {
-	private List<Transaction> transactions;
-	private String accountName;
-	private List<CategoryBudget> categoryBudgets;
-	private ReportSettings reportSettings;
-	private Budget budget;
+	private final List<Transaction> transactions;
+	private final String accountName;
+	private final List<CategoryBudget> categoryBudgets;
+	private final ReportSettings reportSettings;
+	private final Budget budget;
 
 	public ReportConfiguration(List<Transaction> transactions, String accountName, List<CategoryBudget> categoryBudgets, ReportSettings reportSettings, Budget budget)
 	{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java
index 26d341da3eb9aa9a7b4a9168652f06253efba04a..f1c763a44059fe62ec42a0412eca5a3f5707d53f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java
@@ -34,7 +34,7 @@ public class ReportSettingsService
 	private void createDefaultReportSettingsIfNotExists()
 	{
 		Optional<ReportSettings> reportSettingsOptional = reportSettingsRepository.findById(0);
-		if(!reportSettingsOptional.isPresent())
+		if(reportSettingsOptional.isEmpty())
 		{
 			ReportSettings reportSettings = ReportSettings.getDefault();
 			reportSettings.setID(0);
diff --git a/src/main/java/de/deadlocker8/budgetmaster/search/Search.java b/src/main/java/de/deadlocker8/budgetmaster/search/Search.java
index 2f7020f26f5160ad6ac429c3bd74c461e0780a11..5b9917100506c37cfefedcfab538cd6c571304a5 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/search/Search.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/search/Search.java
@@ -62,9 +62,9 @@ public class Search
 		return searchCategory;
 	}
 
-	public void setSearchCategory(boolean searchCatgeory)
+	public void setSearchCategory(boolean searchCategory)
 	{
-		this.searchCategory = searchCatgeory;
+		this.searchCategory = searchCategory;
 	}
 
 	public boolean isSearchTags()
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java b/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java
index 1af4fc0eacb8aed8f6de2463b744232730a0ae1a..a80949f07ca5e1c8f8dcb88363b02c74c03ed50e 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java
@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.RoundingMode;
+import java.text.MessageFormat;
 import java.text.NumberFormat;
 
 @Service
@@ -26,7 +27,7 @@ public class CurrencyService
 
 	public String getCurrencyString(double amount)
 	{
-		return getAmountString(amount, true) + " " + settingsService.getSettings().getCurrency();
+		return MessageFormat.format("{0} {1}", getAmountString(amount, true), settingsService.getSettings().getCurrency());
 	}
 
 	public String getAmountString(int amount)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java b/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java
index 97b58cb5e50440589de5df1f5c2606485999f727..37b60483228c2d7093f902123e7a4ca3e9090e11 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java
@@ -4,9 +4,9 @@ import java.util.Objects;
 
 public class ImportResultItem
 {
-	private EntityType entityType;
-	private int numberOfImportedItems;
-	private int numberOfAvailableItems;
+	private final EntityType entityType;
+	private final int numberOfImportedItems;
+	private final int numberOfAvailableItems;
 
 	public ImportResultItem(EntityType entityType, int numberOfImportedItems, int numberOfAvailableItems)
 	{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/Resetable.java b/src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java
similarity index 77%
rename from src/main/java/de/deadlocker8/budgetmaster/services/Resetable.java
rename to src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java
index 164c7336b0c284b70203229c6518e6a4126a4419..5ededfc49bb18261e1627ae7cae905df8b8c4e65 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/Resetable.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java
@@ -1,6 +1,6 @@
 package de.deadlocker8.budgetmaster.services;
 
-public interface Resetable
+public interface Resettable
 {
 	void deleteAll();
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/UpdateCheckService.java b/src/main/java/de/deadlocker8/budgetmaster/services/UpdateCheckService.java
index 6a7f63e12861d9559861f444cfa13c2b1a7d735f..0756936f482a9bc37cc22837abd1e8bfdbc8706c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/UpdateCheckService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/UpdateCheckService.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class UpdateCheckService
 {
-	private BudgetMasterUpdateService budgetMasterUpdateService;
+	private final BudgetMasterUpdateService budgetMasterUpdateService;
 
 	@Autowired
 	public UpdateCheckService(BudgetMasterUpdateService budgetMasterUpdateService)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java b/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java
index 2a3bc82497bb78f6bd3dae7e5bfff2afd7ba5a19..7cad4b707f9f8b91616910b86929e77fc98e6fac 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.tags;
 
 import de.deadlocker8.budgetmaster.services.AccessAllEntities;
-import de.deadlocker8.budgetmaster.services.Resetable;
+import de.deadlocker8.budgetmaster.services.Resettable;
 import org.padler.natorder.NaturalOrderComparator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public class TagService implements Resetable, AccessAllEntities<Tag>
+public class TagService implements Resettable, AccessAllEntities<Tag>
 {
 	private final TagRepository tagRepository;
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
index 65e72d862f223d072862c5c7dd64bf9afcb6801f..b49351020e0be40ef2e3fb00a6e3c979c652cec5 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
@@ -8,7 +8,7 @@ import de.deadlocker8.budgetmaster.accounts.AccountState;
 import de.deadlocker8.budgetmaster.categories.CategoryService;
 import de.deadlocker8.budgetmaster.categories.CategoryType;
 import de.deadlocker8.budgetmaster.services.AccessAllEntities;
-import de.deadlocker8.budgetmaster.services.Resetable;
+import de.deadlocker8.budgetmaster.services.Resettable;
 import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.deadlocker8.budgetmaster.transactions.Transaction;
 import de.deadlocker8.budgetmaster.transactions.TransactionBase;
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-public class TemplateService implements Resetable, AccessAllEntities<Template>
+public class TemplateService implements Resettable, AccessAllEntities<Template>
 {
 	private static final Gson GSON = new GsonBuilder()
 			.setPrettyPrinting()
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java
index 25321134c9576c0d9ce4b05d38264717090569eb..2e6326550f0fed4ecdc75b845aeb367e24282346 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java
@@ -11,8 +11,8 @@ import java.util.List;
 
 public class TemplateValidator implements Validator
 {
-	private String previousTemplateName;
-	private List<String> existingTemplateNames;
+	private final String previousTemplateName;
+	private final List<String> existingTemplateNames;
 
 	public TemplateValidator(String previousTemplateName, List<String> existingTemplateNames)
 	{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
index 566d037e9a0305a0db77e94c2f212a4796bca45a..2e3723cdc1443bc3f9b9c1e56bab3f4ad5460269 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
@@ -9,7 +9,7 @@ import de.deadlocker8.budgetmaster.categories.CategoryService;
 import de.deadlocker8.budgetmaster.categories.CategoryType;
 import de.deadlocker8.budgetmaster.filter.FilterConfiguration;
 import de.deadlocker8.budgetmaster.repeating.RepeatingOptionRepository;
-import de.deadlocker8.budgetmaster.services.Resetable;
+import de.deadlocker8.budgetmaster.services.Resettable;
 import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.deadlocker8.budgetmaster.tags.Tag;
 import de.deadlocker8.budgetmaster.tags.TagRepository;
@@ -33,7 +33,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
-public class TransactionService implements Resetable
+public class TransactionService implements Resettable
 {
 	private static final int MAX_SUGGESTIONS = 25;
 	private static final Gson GSON = new GsonBuilder()
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java
index 2bae53042f594201e80f4c66595b777868e6c072..1c515e802731b15e5c2440f03de1809b23db9fb4 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java
@@ -8,7 +8,7 @@ public enum TransactionType
 	REPEATING(2),
 	TRANSFER(3);
 
-	private int typeID;
+	private final int typeID;
 
 	TransactionType(int typeID)
 	{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java b/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
index a7d397b7009dd7504248a6cd6c4fb03f972af353..45a53aefe11fb6d8db15dc4858be9245388ce136 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
@@ -88,12 +88,12 @@ public class BudgetMasterUpdateService
 	@Bean
 	public Artifact artifact()
 	{
-		Artifact artifact = new Artifact();
-		artifact.setVersion(Build.getInstance().getVersionName());
-		artifact.setGroupId("de.deadlocker8");
-		artifact.setArtifactId("BudgetMaster");
-		artifact.setArtifactType(Artifact.ArtifactType.RUNTIME);
-		return artifact;
+		Artifact newArtifact = new Artifact();
+		newArtifact.setVersion(Build.getInstance().getVersionName());
+		newArtifact.setGroupId("de.deadlocker8");
+		newArtifact.setArtifactId("BudgetMaster");
+		newArtifact.setArtifactType(Artifact.ArtifactType.RUNTIME);
+		return newArtifact;
 	}
 
 	@Bean
@@ -103,12 +103,12 @@ public class BudgetMasterUpdateService
 		Repository repository = Storage.load(classLoader.getResourceAsStream("repositories.json"), StorageTypes.JSON, Repository.class);
 
 		VersionizerItem versionizerItem = new VersionizerItem(repository, executablePath);
-		UpdateService updateService = UpdateService.startVersionizer(versionizerItem, updateStrategy, UpdateService.InteractionType.HEADLESS, UpdateService.RepositoryType.RELEASE);
+		UpdateService versionizerUpdateService = UpdateService.startVersionizer(versionizerItem, updateStrategy, UpdateService.InteractionType.HEADLESS, UpdateService.RepositoryType.RELEASE);
 		if(executablePath != null)
 		{
-			updateService.addArtifact(artifact, Paths.get(executablePath));
+			versionizerUpdateService.addArtifact(artifact, Paths.get(executablePath));
 		}
-		return updateService;
+		return versionizerUpdateService;
 	}
 
 	public UpdateService getUpdateService()
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java b/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java
index 7bfc521302fb474db5ac4dd38e5052233de71f6e..ec2a5d0bc4d27dbdb13d832299c1fe4f330cf0bd 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java
@@ -2,10 +2,13 @@ package de.deadlocker8.budgetmaster.utils;
 
 public class Strings
 {
+	private Strings()
+	{
+	}
+
 	//MISC
 	public static final String CATEGORY_NONE = "category.none";
 	public static final String CATEGORY_REST = "category.rest";
-	public static final String VERSION = "version";
 	public static final String TITLE_INCOMES = "title.incomes";
 	public static final String TITLE_EXPENDITURES = "title.expenditures";
 	public static final String TITLE_CATEGORY_BUDGETS = "title.category.budgets";
@@ -59,8 +62,4 @@ public class Strings
 	public static final String REPORT_INCOMES = "report.incomes";
 	public static final String REPORT_PAYMENTS = "report.expenditures";
 	public static final String REPORT_BUDGET_REST = "report.budget.rest";
-
-	private Strings()
-	{
-	}
 }
\ No newline at end of file