Code Duplication behoben