diff --git a/commentaries/admin.py b/commentaries/admin.py
index 4d6b152ba55dd2e24cd2c3572694e099c520c32f..d412cd35a7905c19cdd8a53b654e99270c05a0f3 100644
--- a/commentaries/admin.py
+++ b/commentaries/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from commentaries.models import *
+from commentaries.models import Commentary
 
 
 class CommentaryAdmin(admin.ModelAdmin):
diff --git a/commentaries/forms.py b/commentaries/forms.py
index c1626ab06f3d05be4a47a7401dfebaa765a2ca24..58208451a72846c65a31bcec71e5adad1704fb06 100644
--- a/commentaries/forms.py
+++ b/commentaries/forms.py
@@ -1,6 +1,7 @@
 from django import forms
 
-from .models import *
+from .models import Commentary
+
 
 COMMENTARY_ACTION_CHOICES = (
     (0, 'modify'), 
diff --git a/commentaries/models.py b/commentaries/models.py
index d22ff7fc8f8d8bba26dbb174ac2a3f257b7830ca..0c179327d14ba0c09e451f2730d0b4fb3b2303b2 100644
--- a/commentaries/models.py
+++ b/commentaries/models.py
@@ -2,10 +2,12 @@ from django.utils import timezone
 from django.db import models
 from django.contrib.auth.models import User
 
-from .models import *
 
-from journals.models import *
-from scipost.models import *
+from journals.models import SCIPOST_JOURNALS_DOMAINS, SCIPOST_JOURNALS_SPECIALIZATIONS
+from scipost.models import Contributor
+from scipost.models import SCIPOST_DISCIPLINES
+
+
 
 COMMENTARY_TYPES = (
     ('published', 'published paper'),
diff --git a/commentaries/views.py b/commentaries/views.py
index 4e59aa145ab60cba1813b6ddae43f9c0955672e7..64d1256e0e4728f2cd07aa74649c52f2177a1786 100644
--- a/commentaries/views.py
+++ b/commentaries/views.py
@@ -9,16 +9,16 @@ from django.http import HttpResponse, HttpResponseRedirect
 from django.views.decorators.csrf import csrf_protect
 from django.db.models import Avg
 
-from .models import *
-from .forms import *
+from .models import Commentary
+from .forms import RequestCommentaryForm, VetCommentaryForm, CommentarySearchForm
 
 from comments.models import Comment
 from comments.forms import CommentForm
-from scipost.forms import TITLE_CHOICES, AuthenticationForm#, OpinionForm
+from scipost.models import Contributor
+from scipost.models import title_dict
+from scipost.forms import AuthenticationForm
 
 
-title_dict = dict(TITLE_CHOICES) # Convert titles for use in emails
-
 ################
 # Commentaries
 ################