diff --git a/.zuul.yaml b/.zuul.yaml
index aad1332e..e69de29b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,30 +0,0 @@
-- project:
-    check:
-      jobs:
-        - pyghmi-tempest-devstack-ironic-pxe_ipmitool-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^setup.cfg$
-    gate:
-      jobs:
-        - pyghmi-tempest-devstack-ironic-pxe_ipmitool-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^setup.cfg$
-
-- job:
-    name: pyghmi-tempest-devstack-ironic-pxe_ipmitool-src
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-devstack-ironic-pxe_ipmitool-pyghmi-src/run.yaml
-    post-run: playbooks/legacy/tempest-devstack-ironic-pxe_ipmitool-pyghmi-src/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/ironic
-      - openstack/ironic-lib
-      - openstack/ironic-python-agent
-      - openstack/ironic-tempest-plugin
-      - openstack/pyghmi
-      - openstack/python-ironicclient
-      - openstack/tempest
-      - openstack/virtualbmc
diff --git a/bin/fakebmc b/bin/fakebmc
index 1f87eb24..8f1985a2 100755
--- a/bin/fakebmc
+++ b/bin/fakebmc
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-__author__ = 'jjohnson2@lenovo.com'
+# __author__ = 'jjohnson2@lenovo.com'
 
 # this is a quick sample of how to write something that acts like a bmc
 # to play:
diff --git a/bin/pyghmicons b/bin/pyghmicons
index 9701c202..41e37dc2 100755
--- a/bin/pyghmicons
+++ b/bin/pyghmicons
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""
-@author: Jarrod Johnson <jbjohnso@us.ibm.com>
-"""
-
-"""A simple little script to exemplify/test ipmi.console module
-"""
+# """
+# @author: Jarrod Johnson <jbjohnso@us.ibm.com>
+# """
+#
+# """A simple little script to exemplify/test ipmi.console module
+# """
 import fcntl
 import os
 import select
diff --git a/bin/pyghmiutil b/bin/pyghmiutil
index 5d94ab05..d0130701 100755
--- a/bin/pyghmiutil
+++ b/bin/pyghmiutil
@@ -12,14 +12,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""
-@author: Jarrod Johnson <jbjohnso@us.ibm.com>
-"""
+# """
+# @author: Jarrod Johnson <jbjohnso@us.ibm.com>
+# """
 
-"""This is an example of using the library in a synchronous fashion. For now,
-it isn't conceived as a general utility to actually use, just help developers
-understand how the ipmi_command class workes.
-"""
+# """This is an example of using the library in a synchronous fashion. For now,
+# it isn't conceived as a general utility to actually use, just help developers
+# understand how the ipmi_command class workes.
+# """
 import os
 import string
 import sys
diff --git a/bin/virshbmc b/bin/virshbmc
index 3f454446..b4c3b917 100755
--- a/bin/virshbmc
+++ b/bin/virshbmc
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 # Written by pmartini2, but mostly a clone of fakebmc, written by jjohnson2
-__author__ = 'pmartini2@bloomberg.net'
+# __author__ = 'pmartini2@bloomberg.net'
 
 # This is a simple, but working proof of concept of using pyghmi.ipmi.bmc to
 # control a VM
diff --git a/pyghmi/ipmi/oem/lenovo/imm.py b/pyghmi/ipmi/oem/lenovo/imm.py
index 353c49b2..beca24c1 100644
--- a/pyghmi/ipmi/oem/lenovo/imm.py
+++ b/pyghmi/ipmi/oem/lenovo/imm.py
@@ -884,7 +884,7 @@ class XCCClient(IMMClient):
                     standalonedisks.append(
                         storage.Disk(
                             name=disk['name'], description=disk['type'],
-                            id=(cid, disk['id']),  status=disk['RAIDState'],
+                            id=(cid, disk['id']), status=disk['RAIDState'],
                             serial=disk['serialNo'], fru=disk['fruPartNo']))
         return storage.ConfigSpec(disks=standalonedisks, arrays=pools)
 
diff --git a/pyghmi/ipmi/private/constants.py b/pyghmi/ipmi/private/constants.py
index 193dba0c..7ada5ab6 100644
--- a/pyghmi/ipmi/private/constants.py
+++ b/pyghmi/ipmi/private/constants.py
@@ -1285,7 +1285,7 @@ sensor_type_offsets = {
             'deassertion_severity': const.Health.Ok,
         },
     },
-    0x21:  {  # slot/connector
+    0x21: {  # slot/connector
         0x0: {
             'desc': 'Fault',
             'severity': const.Health.Critical,
diff --git a/tox.ini b/tox.ini
index 53d76638..80444ae0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ sitepackages = True
 
 [testenv:pep8]
 whitelist_externals = bash
-commands = bash -c 'pep8 pyghmi bin/*'
+commands = bash -c 'pycodestyle pyghmi bin/*'
 
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}
@@ -29,3 +29,6 @@ commands = {posargs}
 [flake8]
 exclude = .venv,.tox,dist,doc,*.egg,build
 show-source = true
+
+[pep8]
+ignore = E731,E226,E123