Revised constructor, changed terminology, and add simpler cipher cloning