Pylint and TODO clean!