diff --git a/examples/Listening_for_changes/renewables_database.py b/examples/Listening_for_changes/renewables_database.py
index ca075db..ff01177 100644
--- a/examples/Listening_for_changes/renewables_database.py
+++ b/examples/Listening_for_changes/renewables_database.py
@@ -12,7 +12,6 @@
 
 import wapi
 import pandas as pd
-import matplotlib.pyplot as plt
 import time
 import os
 
diff --git a/examples/general_examples/gen_pv_actuals_vs_forecast.py b/examples/general_examples/gen_pv_actuals_vs_forecast.py
index 122e25c..017099e 100644
--- a/examples/general_examples/gen_pv_actuals_vs_forecast.py
+++ b/examples/general_examples/gen_pv_actuals_vs_forecast.py
@@ -1,5 +1,5 @@
 """
-This simple example compares yesterdays Photovoltaic Forecast based on the EC00
+This simple example compares yesterday's Photovoltaic Forecast based on the EC00
 weather forecast and the GFS00 weather forecasts with the Actual PV production.
 The comparison can be performed for any region
 """
diff --git a/examples/general_examples/gen_save_pandas.py b/examples/general_examples/gen_save_pandas.py
index b696594..8aae1bf 100644
--- a/examples/general_examples/gen_save_pandas.py
+++ b/examples/general_examples/gen_save_pandas.py
@@ -7,7 +7,6 @@
 
 import wapi
 import pandas as pd
-import matplotlib.pyplot as plt
 import os
 
 ############################################
diff --git a/examples/intraday_examples/absolute_intraday_price_forecast.py b/examples/intraday_examples/absolute_intraday_price_forecast.py
index 3c6ba7c..8ec2e08 100644
--- a/examples/intraday_examples/absolute_intraday_price_forecast.py
+++ b/examples/intraday_examples/absolute_intraday_price_forecast.py
@@ -6,7 +6,6 @@
 """
 
 import wapi
-import pandas as pd
 import matplotlib.pyplot as plt
 
 ############################################
diff --git a/requirements.txt b/requirements.txt
index 9816be4..ba77ef1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@ pytz
 pandas >= 0.21
 future >= 0.16
 configparser >= 3.5; python_version < "3"
+matplotlib
\ No newline at end of file
diff --git a/wapi/auth.py b/wapi/auth.py
index 9d5bca8..19e6395 100644
--- a/wapi/auth.py
+++ b/wapi/auth.py
@@ -2,7 +2,6 @@
 # Authentication support
 #
 
-import imp
 import json
 import time
 import threading
diff --git a/wapi/events.py b/wapi/events.py
index f63277e..c7631fd 100644
--- a/wapi/events.py
+++ b/wapi/events.py
@@ -60,7 +60,7 @@ def fetch_events(self):
                         if sse_event.retry is not None:
                             try:
                                 self.retry = int(sse_event.retry)
-                            except:
+                            except Exception:
                                 pass
                         if self.do_shutdown:
                             break
@@ -107,7 +107,7 @@ def __init__(self, sse_event):
         self._raw_event = sse_event
         try:
             self.json_data = json.loads(sse_event.data)
-        except:
+        except Exception:
             self.json_data = None