Shortcodes changed to return data instead of print it