diff --git a/dpaste/highlight.py b/dpaste/highlight.py
index 5e25084..ef0389d 100644
--- a/dpaste/highlight.py
+++ b/dpaste/highlight.py
@@ -29,8 +29,6 @@ class NakedHtmlFormatter(HtmlFormatter):
 
 def pygmentize(code_string, lexer_name=LEXER_DEFAULT):
     lexer_name = LEXER_LIST_NAME.get(lexer_name, None)
-
-    print lexer_name
     try:
         if lexer_name:
             lexer = get_lexer_by_name(lexer_name)
diff --git a/dpaste/templates/dpaste/404.html b/dpaste/templates/dpaste/404.html
index 4eb3a75..fbd18e5 100644
--- a/dpaste/templates/dpaste/404.html
+++ b/dpaste/templates/dpaste/404.html
@@ -1,9 +1,8 @@
 {% extends "dpaste/base.html" %}
 
-{% block headline %}
-    <h1>404 Not found</h1>
-{% endblock %}
+{% block title %}404 Not found{% endblock %}
+{% block headline %}404 Not found{% endblock %}
 
-{% block content %}
+{% block page %}
     <p>Snippet you have searched is not available (anymore).</p>
 {% endblock %}
diff --git a/dpaste/templates/dpaste/500.html b/dpaste/templates/dpaste/500.html
index 6cfefd5..9263c2a 100644
--- a/dpaste/templates/dpaste/500.html
+++ b/dpaste/templates/dpaste/500.html
@@ -1,9 +1,8 @@
 {% extends "dpaste/base.html" %}
 
-{% block headline %}
-    <h1>500 Internal Server Error</h1>
-{% endblock %}
+{% block title %}500 Internal Server Error{% endblock %}
+{% block headline %}500 Internal Server Error{% endblock %}
 
-{% block content %}
-    <p>Sorry, there was an error with your request. My fault!</p>
+{% block page %}
+    <p>Sorry, there was an error with your request. The server notified the admin via email.</p>
 {% endblock %}