updated regex - pep8, python3