code cleanup guided by pylint>