Docblock changes and clarity in conditionals