PEP8 cleanup.  Not sure if import * fixes are okay