Switch Vor- and Nachname

and also delete unnecessary code