Small changes to comply with pep8. Fix an import