CS and docblock fixes

Third of a few pulls to replace #6.
Should the `|null` be kept here? Since it allows it.