Dynamic: more codestyling, minor corrections.