Cleanup and refactor of shakemap importer