Moving datashape imports to importing package, pep-8 cleanups here and there