diff --git a/heat/engine/api.py b/heat/engine/api.py
index ad580ff37..c59a3bf37 100644
--- a/heat/engine/api.py
+++ b/heat/engine/api.py
@@ -95,11 +95,11 @@ def format_stack(stack, preview=False):
         rpc_api.STACK_ID: dict(stack.identifier()),
         rpc_api.STACK_CREATION_TIME: timeutils.isotime(stack.created_time),
         rpc_api.STACK_UPDATED_TIME: updated_time,
-        rpc_api.STACK_NOTIFICATION_TOPICS: [],  # TODO Not implemented yet
+        rpc_api.STACK_NOTIFICATION_TOPICS: [],  # TODO(?) Not implemented yet
         rpc_api.STACK_PARAMETERS: stack.parameters.map(str),
         rpc_api.STACK_DESCRIPTION: stack.t[stack.t.DESCRIPTION],
         rpc_api.STACK_TMPL_DESCRIPTION: stack.t[stack.t.DESCRIPTION],
-        rpc_api.STACK_CAPABILITIES: [],   # TODO Not implemented yet
+        rpc_api.STACK_CAPABILITIES: [],   # TODO(?) Not implemented yet
         rpc_api.STACK_DISABLE_ROLLBACK: stack.disable_rollback,
         rpc_api.STACK_TIMEOUT: stack.timeout_mins,
         rpc_api.STACK_OWNER: stack.username,
diff --git a/tox.ini b/tox.ini
index 9ab8ee480..a47f2e79f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -57,7 +57,6 @@ commands =
 # E265 block comment should start with '# '
 # F402 import shadowed by loop variable
 # F812 list comprehension redefines variable
-# H101 Use TODO(NAME)
 # H202 assertRaises Exception too broad
 # H233 Python 3.x incompatible use of print operator
 # H305 imports not grouped correctly
@@ -67,7 +66,7 @@ commands =
 # H405 multi line docstring summary not separated with an empty line
 # H803 no full stop at the end of the commit message
 # H904 Wrap long lines in parentheses instead of a backslash
-ignore = E251,E265,F402,F812,H101,H202,H233,H305,H307,H402,H404,H405,H803,H904
+ignore = E251,E265,F402,F812,H202,H233,H305,H307,H402,H404,H405,H803,H904
 show-source = true
 exclude=.venv,.git,.tox,dist,*openstack/common*,*lib/python*,*egg,tools,build
 max-complexity=20