Clean-up

This pull request will 'repair' all issues detected by PhpStorms static code analysis, see list of included commits.