Tidy up exports