Updated shortcodes to remove the spaces