Docblock changes and scrutinizer changes