Some code cleanups to make pylint happier ;)