Added shortcode feature + cleanup