THEMA 7: comments added, style changes
THEMA 7: comments added, style changes