Made imports follow pep8 guidelines