RESOLVE #20 Simplify shortcodes