Cleanup

- simplifies and cleans up the importer

:trollface: