Minor formatting + group shortcode