Doc and codestyle fixes