would remove "as per the TODO" since that adds a second pylint...