Cleanup docblocks per @rzen