A little more docblock cleanup