Fixes for PHPCS in theme

Fixes PHPCS issues in the theme