docfix / pylint / pep8 / refactor