Core module: working under phpcs and phpmd fixes.