Additional 'Shortcode' Class Refactor