Small fix and cleanups (suggested by pyLint)