Improving shortcodes more