Moving imports around + some pep8 fixes that I actually care about.