added the shortcode functionality and removed the unnecessary code changes