Cleaning up and adding path exporter