Refactoring shortcodes