Some cosmetic changes (Juergen Heinzl)