Few more pylint and pyflakes warning fixes