Code-Cleanup and german translation