Cleaned import and pep8 syntax