Clean and consolidate export code #190

Propagate staff name etc...