Import changes

Primarily for changes in formatting of import statements. I changed a handful of other things in the file while I was there.