PEP8 + Rearrange names in exporter