Convert shortcode classes to Singleton pattern
Reintroduce tidy -1 feature using htmLawed v1.1.15