Code Style and Docu fixes

[ci skip]