Fixing exporter to look cleaner