tidy up, confs, vocabs