Code clean up. Use more consistent import/export format.