Shortcode Cleanup, form extracted to view.