Fixes more imports because pep8