WP Coding Standards cleanup