Made the importer more pythonic