Clean up shortcode code