Protokoll +  code cleanup 01