Cleanup / improvement of docblocks