Eliminated echo tags for directives that print