Refactored 'Shortcode' Class