Tidy up, working export scripts