Docblock cleanup part 2