Ingo Berg cleanup; non functional changes