daca2: refactorings and fix of indentlevel that might have screwed up the script.