Refactor to use Handler and HandlerFactory
Refactor short code handling into separate class
Test for shortcode pre action
Fix for action hook which is not public