Aufgabe 13+14

+CleanUp

Change-Id: I797b9171f57798cc7d70c66c5d02ff2fa1e1a505
Signed-off-by: Tobias <pahlings@gmail.com>