refactor(core): refactor for phpcs