Scrutenizer cleanup (3)
Scrutenizer cleanup (4)
phpdoc