Refactor cipher information management
3 files changed