Reorganize imports!

Also apparently you should use "is" when comparing to None?