Tidied up style constants, exporter and importer