phpcs fix and error fix.