Added variable definitions to extractor
Cleaned up export a bit