task_shortcode.php refactoring