refactor and clean-up shapefile/converter