Cleanup of PHP mess detector / PHP code sniffer errors