WP, deep refactor