state: simplify cipher selection
state: unify variables in Session