code cleanup (pep8 & pylint)
updated code (not pylint clean: 66 warnings remaining)