#121 Some clean-up for shortcode code