cleanup, assisted by pylint