diff --git a/alpaca_trade_api/rest.py b/alpaca_trade_api/rest.py
index 8567ba5a..6aa466a0 100644
--- a/alpaca_trade_api/rest.py
+++ b/alpaca_trade_api/rest.py
@@ -113,13 +113,14 @@ def validate(amount: int, unit: TimeFrameUnit):
             raise "Amount must be a positive integer value."
 
         if unit == TimeFrameUnit.Minute and amount > 59:
-            raise "Second or Minute units can only be used with amounts between 1-59."
+            raise "Second or Minute units can only be used " + \
+                "with amounts between 1-59."
 
         if unit == TimeFrameUnit.Hour and amount > 23:
             raise "Hour units can only be used with amounts 1-23"
 
 
-# TimeFrame.Minute, TimeFrame.Hour and TimeFrame.Day kept for backwards compatibility
+# These are kept for backwards compatibility
 TimeFrame.Minute = TimeFrame(1, TimeFrameUnit.Minute)
 TimeFrame.Hour = TimeFrame(1, TimeFrameUnit.Hour)
 TimeFrame.Day = TimeFrame(1, TimeFrameUnit.Day)
diff --git a/tests/test_rest.py b/tests/test_rest.py
index 60096f88..7ca254dc 100644
--- a/tests/test_rest.py
+++ b/tests/test_rest.py
@@ -791,7 +791,8 @@ def test_data(reqmock):
 
 def test_timeframe(reqmock):
     # Custom timeframe: Minutes
-    reqmock.get('https://data.alpaca.markets/v2/stocks/AAPL/bars?timeframe=45Min&adjustment=raw&'
+    reqmock.get('https://data.alpaca.markets/v2/stocks/AAPL/bars?'
+                'timeframe=45Min&adjustment=raw&'
                 'start=2021-06-08&end=2021-06-08', text='{}')
     api = tradeapi.REST('key-id', 'secret-key', api_version='v1')
     timeframe = tradeapi.TimeFrame(45, tradeapi.TimeFrameUnit.Minute)
@@ -799,7 +800,8 @@ def test_timeframe(reqmock):
     assert reqmock.called
 
     # Custom timeframe: Hours
-    reqmock.get('https://data.alpaca.markets/v2/stocks/AAPL/bars?timeframe=23Hour&adjustment=raw&'
+    reqmock.get('https://data.alpaca.markets/v2/stocks/AAPL/bars?'
+                'timeframe=23Hour&adjustment=raw&'
                 'start=2021-06-08&end=2021-06-08', text='{}')
     timeframe = tradeapi.TimeFrame(23, tradeapi.TimeFrameUnit.Hour)
     api.get_bars('AAPL', timeframe, '2021-06-08', '2021-06-08')
@@ -817,7 +819,8 @@ def test_timeframe(reqmock):
     timeframe = tradeapi.TimeFrame(23, tradeapi.TimeFrameUnit.Hour)
     timeframe.amount = 5
     timeframe.unit = tradeapi.TimeFrameUnit.Minute
-    reqmock.get('https://data.alpaca.markets/v2/stocks/AAPL/bars?timeframe=5Min&adjustment=raw&'
+    reqmock.get('https://data.alpaca.markets/v2/stocks/AAPL/bars?'
+                'timeframe=5Min&adjustment=raw&'
                 'start=2021-06-08&end=2021-06-08', text='{}')
     api.get_bars('AAPL', timeframe, '2021-06-08', '2021-06-08')
     assert reqmock.called