diff --git a/certificate/templates/fossee_internship_cerificate_download.html b/certificate/templates/fossee_internship_cerificate_download.html
deleted file mode 100644
index 7148f48..0000000
--- a/certificate/templates/fossee_internship_cerificate_download.html
+++ /dev/null
@@ -1,67 +0,0 @@
-{% extends 'base.html' %}
-{% block header%}
-    <h1> FOSSEE Internship Certificate</h1>
-{% endblock %}
-{% block content %}
-          <div class="modal fade" id="invalidModal" tabindex="-1" role="dialog" aria-labelledby="invalidModalLabel" aria-hidden="true">
-              <div class="modal-dialog">
-                <div class="modal-content">
-                  <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                    <h4 class="modal-title" id="invalidModalLabel">Invalid Category</h4>
-                  </div>
-                  <div class="modal-body">
-                    The requested certificate is unavailable for your email address. Please select the appropriate category and retry.
-                  </div>
-                </div>
-              </div>
-          </div>
-          <form class="col-lg-12" action="{% url 'certificate:fossee_internship15_cerificate_download' %}" method="post">
-            {% csrf_token %}
-            {{ message }}
-            <hr>            
-            &nbsp;&nbsp;<input type="hidden" name="type" id="A" value="A" checked="True">
-            <hr>
-            <div id ="paper">
-            {% if user_project %}
-                <span><h3>Papers presented</h3><span>
-                        <div class="radio" style="padding-left:350px;text-align:left">
-                {% for user in user_project %}
-                <input type="hidden" name="paper" value="{{ user.project_title }}">{{ user.project_title }}<br>
-                {% endfor %}
-                </div>
-            {% endif %}
-            <input type="hidden" name="paper" value="{{ user.project_title }}">{{ user.project_title }}<br>
-        </div>
-            <div class="input-group" style="width:340px;text-align:center;margin:0 auto;">
-            <input style="width:450;" class="form-control input-lg" placeholder="Enter the email address you used for registration" type="text" id="email" name=email>
-              <span class="input-group-btn"><button class="btn btn-lg btn-primary" type="submit">Download Certificate</button></span>
-            </div>
-          </form>
-          <center><h4>Problem in downloading the certificate? Write to us at <a href="mailto:certificates@fossee.in">certificates[at]fossee[dot]in</a></h4>
-{% endblock %}
-
-{% block javascript %}
-<script>
-    $(document).ready(function(){
-        value = "{{ v }}"
-        email = ""
-        error = "{{ error }}"
-        if(error == "True"){
-            $("#invalidModal").modal();
-        }
-        if(value == "paper"){
-            $('#A').prop('checked', true)
-            email = "{{ user_project.0.email }}";
-        }
-        $('#email').val(email);
-        notreg = "{{ notregistered }}";
-        if(notreg == "1"){
-            $("#invalidModal").modal();
-        }
-        $("[name=type]").change(function(){
-            $("#paper").remove();
-        });
-   });
-</script>
-{% endblock %}
diff --git a/certificate/views.py b/certificate/views.py
index 88252ca..2634477 100755
--- a/certificate/views.py
+++ b/certificate/views.py
@@ -2438,11 +2438,17 @@ def fossee_internship_cerificate_download(request):
     return render_to_response('fossee_internship_cerificate_download.html', context, ci)
 
 
-def create_fossee_internship_cerificate(certificate_path, name, qrcode, wtype, paper, internship_project_duration, student_edu_detail, student_institute_detail, superviser_name_detail, workshop, file_name):
+def create_fossee_internship_cerificate(
+      certificate_path, name, qrcode,
+      wtype, paper, internship_project_duration, student_edu_detail,
+      student_institute_detail, superviser_name_detail,
+      workshop, file_name):
     error = False
     try:
         download_file_name = None
-        year = internship_project_duration[internship_project_duration.find('to')-5:internship_project_duration.find('to')].strip()
+        year = internship_project_duration[
+            internship_project_duration.find('to')-5:internship_project_duration.find('to')
+            ].strip()
         if wtype == 'P':
             template = 'template_FIC2016Pcertificate'
             download_file_name = 'FIC2016Pcertificate.pdf'
@@ -2470,7 +2476,8 @@ def create_fossee_internship_cerificate(certificate_path, name, qrcode, wtype, p
                 (certificate_path, file_name), 'w')
         create_tex.write(content_tex)
         create_tex.close()
-        return_value, err = _make_certificate_certificate(certificate_path, wtype, file_name)
+        return_value, err = _make_certificate_certificate(certificate_path,
+                                                          wtype, file_name)
         if return_value == 0:
             pdf = open('{0}{1}.pdf'.format(certificate_path, file_name) , 'r')
             response = HttpResponse(content_type='application/pdf')