Cleaned imports and pep8 syntax