Apply changes as suggested by checkdoc