STY: Import and pep 8 cleanup