diff --git a/TodoParser.py b/TodoParser.py
index ffcf242..33006c4 100644
--- a/TodoParser.py
+++ b/TodoParser.py
@@ -2,8 +2,8 @@ import os
 import re
 import requests
 from ruamel.yaml import YAML
-from LineStatus import *
-from Issue import *
+from LineStatus import LineStatus
+from Issue import Issue
 import requests
 import json
 from urllib.parse import urlparse
diff --git a/main.py b/main.py
index 7f7568b..b0dd63f 100644
--- a/main.py
+++ b/main.py
@@ -5,14 +5,13 @@ import os
 import re
 from time import sleep
 from io import StringIO
-from ruamel.yaml import YAML
 import itertools
 import operator
 from collections import defaultdict
-from TodoParser import *
-from LineStatus import *
-from LocalClient import *
-from GitHubClient import *
+from TodoParser import TodoParser
+from LineStatus import LineStatus
+from LocalClient import LocalClient
+from GitHubClient import GitHubClient
 
 
 if __name__ == "__main__":