Updated shortcode to return, not echo