Fixed some codesmug discovered by pylint