Fix doc-blocks in header and fix codestyle issues