Custom Shortcodes:
- code cleanup