updated for WP coding guidelines