Condense the shortcode additions into one general area

Fix a little coding derp