fix phpcs and schecks notices
fix more lint checks