Fixed for issues checked by pylint, pep8, pyflakes