few changes to comply with pep8