Minor shortcode section adjustment again