diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/Tag.java b/src/main/java/de/deadlocker8/budgetmaster/entities/Tag.java
index dfcc5de842dc284e002ec3015dbba34ddfa6004e..86a4afd4c1b5cac1496a7829f7f5a49b07bf313d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/entities/Tag.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/entities/Tag.java
@@ -62,7 +62,10 @@ public class Tag
 	@Override
 	public String toString()
 	{
-		return "Tag{ID=" + ID +	", name='" + name + '}';
+		return "Tag{" +
+				"ID=" + ID +
+				", name='" + name + '\'' +
+				'}';
 	}
 
 	@Override
@@ -78,7 +81,6 @@ public class Tag
 	@Override
 	public int hashCode()
 	{
-
 		return Objects.hash(ID, name);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java
index 767cfdbfc8c2fb9d5691bfb5763c5d83ae43ca41..f65eb41692379fb7dbb07279dc1dc473f257319c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java
@@ -112,16 +112,21 @@ public class TransactionService implements Resetable
 	{
 		if(isDeletable(ID))
 		{
-			Transaction transactionToDelete = transactionRepository.findOne(ID);
-			// handle repeating transactions
-			if(transactionToDelete.getRepeatingOption() != null)
-			{
-				repeatingOptionRepository.delete(transactionToDelete.getRepeatingOption().getID());
-			}
-			else
-			{
-				transactionRepository.delete(ID);
-			}
+			deleteTransactionInRepo(ID);
+		}
+	}
+
+	private void deleteTransactionInRepo(Integer ID)
+	{
+		Transaction transactionToDelete = transactionRepository.findOne(ID);
+		// handle repeating transactions
+		if(transactionToDelete.getRepeatingOption() != null)
+		{
+			repeatingOptionRepository.delete(transactionToDelete.getRepeatingOption().getID());
+		}
+		else
+		{
+			transactionRepository.delete(ID);
 		}
 	}
 
@@ -134,7 +139,10 @@ public class TransactionService implements Resetable
 	@Override
 	public void deleteAll()
 	{
-		transactionRepository.deleteAll();
+		for(Transaction transaction : transactionRepository.findAll())
+		{
+			deleteTransactionInRepo(transaction.getID());
+		}
 	}
 
 	@Override