Cleaned up imports (to follow pep8)