improve some scrutinizer issues

different types
unused vars
PHPDocs