Cleaning up some shortcode stuff
Cleaning gallery logic