Cleanedup & added shortcode atts