Changes to keep to WP Coding Standards