Clean up template-tags.php