fix issues found on review; fix pep8 violations