Refactor updated to spec for WordPress.org's request.