Code style & doc block fixes