more WP code review