PHPDoc and a small code restructure for scrutinizer, no effective changes