Updated export parser, but make everything prettier to read