Cleanup and update shortcode